Attachment 8729 Details for Bug 19902 – Git formatted patch to unify %configure macros in rpm-setup

[patch] Git formatted patch to unify %configure macros in rpm-setup

0001-Unify-the-configure-macros.patch (text/plain), 2.40 KB, created by Neal Gompa on 2016-12-06 13:44:13 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Neal Gompa

Created: 2016-12-06 13:44:13 CET

Size: 2.40 KB

patch

obsolete

>From f60c58dd04e40179e7f772d93cb275f6e872b1d1 Mon Sep 17 00:00:00 2001
>From: Neal Gompa <ngompa13@gmail.com>
>Date: Tue, 6 Dec 2016 07:41:21 -0500
>Subject: [PATCH] Unify the %configure macros
>
>%configure now behaves like %configure2_5x by default, but will revert
>to legacy %configure behavior if "%global _legacy_autotools 1" is
>present in the spec of the package being built.
>---
> build.macros.in | 30 +++++-------------------------
> 1 file changed, 5 insertions(+), 25 deletions(-)
>
>diff --git a/build.macros.in b/build.macros.in
>index f7348de..4762296 100644
>--- a/build.macros.in
>+++ b/build.macros.in
>@@ -236,33 +236,13 @@ export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%o
> # This is an improved version of %configure (from PLD team).
> %configure \
>   %before_configure ; \
>-  %{?!_disable_libtoolize:%{?__libtoolize_configure:%{__libtoolize_configure};}} \
>+  %{?_legacy_autotools:%{?!_disable_libtoolize:%{?__libtoolize_configure:%{__libtoolize_configure};}}} \
>+  %{!?_legacy_autotools:%{?_enable_libtoolize:%{?__libtoolize_configure:%{__libtoolize_configure};}}} \
>   [ -f $CONFIGURE_TOP/configure.in -o -f $CONFIGURE_TOP/configure.ac ] && \
>   CONFIGURE_XPATH="--x-includes=%{_prefix}/include --x-libraries=%{_prefix}/%{_lib}" \
>-  $CONFIGURE_TOP/configure %{_target_platform} \\\
>-	--program-prefix=%{?_program_prefix} \\\
>- 	--prefix=%{_prefix} \\\
>-	--exec-prefix=%{_exec_prefix} \\\
>-	--bindir=%{_bindir} \\\
>-	--sbindir=%{_sbindir} \\\
>-	--sysconfdir=%{_sysconfdir} \\\
>-	--datadir=%{_datadir} \\\
>-	--includedir=%{_includedir} \\\
>-	--libdir=%{_libdir} \\\
>-	--libexecdir=%{_libexecdir} \\\
>-	--localstatedir=%{_localstatedir} \\\
>-	--sharedstatedir=%{_sharedstatedir} \\\
>-	--mandir=%{_mandir} \\\
>-	--infodir=%{_infodir} \\\
>-    $CONFIGURE_XPATH
>-
>-%configure2_5x \
>-  %before_configure ; \
>-  %{?_enable_libtoolize:%{?__libtoolize_configure:%{__libtoolize_configure};}} \
>-  [ -f $CONFIGURE_TOP/configure.in -o -f $CONFIGURE_TOP/configure.ac ] && \
>-  CONFIGURE_XPATH="--x-includes=%{_prefix}/include --x-libraries=%{_prefix}/%{_lib}" \
>-  $CONFIGURE_TOP/configure --build=%{_target_platform} \\\
>- 	--prefix=%{_prefix} \\\
>+  $CONFIGURE_TOP/configure %{!?_legacy_autotools:--build=}%{_target_platform} \\\
>+	%{?_program_prefix:--program-prefix=%{_program_prefix}} \\\
>+	--prefix=%{_prefix} \\\
> 	--exec-prefix=%{_exec_prefix} \\\
> 	--bindir=%{_bindir} \\\
> 	--sbindir=%{_sbindir} \\\
>-- 
>2.9.3 (Apple Git-75)
>

From f60c58dd04e40179e7f772d93cb275f6e872b1d1 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa13@gmail.com>
Date: Tue, 6 Dec 2016 07:41:21 -0500
Subject: [PATCH] Unify the %configure macros

%configure now behaves like %configure2_5x by default, but will revert
to legacy %configure behavior if "%global _legacy_autotools 1" is
present in the spec of the package being built.
---
 build.macros.in | 30 +++++-------------------------
 1 file changed, 5 insertions(+), 25 deletions(-)

diff --git a/build.macros.in b/build.macros.in
index f7348de..4762296 100644
--- a/build.macros.in
+++ b/build.macros.in
@@ -236,33 +236,13 @@ export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%o
 # This is an improved version of %configure (from PLD team).
 %configure \
   %before_configure ; \
-  %{?!_disable_libtoolize:%{?__libtoolize_configure:%{__libtoolize_configure};}} \
+  %{?_legacy_autotools:%{?!_disable_libtoolize:%{?__libtoolize_configure:%{__libtoolize_configure};}}} \
+  %{!?_legacy_autotools:%{?_enable_libtoolize:%{?__libtoolize_configure:%{__libtoolize_configure};}}} \
   [ -f $CONFIGURE_TOP/configure.in -o -f $CONFIGURE_TOP/configure.ac ] && \
   CONFIGURE_XPATH="--x-includes=%{_prefix}/include --x-libraries=%{_prefix}/%{_lib}" \
-  $CONFIGURE_TOP/configure %{_target_platform} \\\
-	--program-prefix=%{?_program_prefix} \\\
- 	--prefix=%{_prefix} \\\
-	--exec-prefix=%{_exec_prefix} \\\
-	--bindir=%{_bindir} \\\
-	--sbindir=%{_sbindir} \\\
-	--sysconfdir=%{_sysconfdir} \\\
-	--datadir=%{_datadir} \\\
-	--includedir=%{_includedir} \\\
-	--libdir=%{_libdir} \\\
-	--libexecdir=%{_libexecdir} \\\
-	--localstatedir=%{_localstatedir} \\\
-	--sharedstatedir=%{_sharedstatedir} \\\
-	--mandir=%{_mandir} \\\
-	--infodir=%{_infodir} \\\
-    $CONFIGURE_XPATH
-
-%configure2_5x \
-  %before_configure ; \
-  %{?_enable_libtoolize:%{?__libtoolize_configure:%{__libtoolize_configure};}} \
-  [ -f $CONFIGURE_TOP/configure.in -o -f $CONFIGURE_TOP/configure.ac ] && \
-  CONFIGURE_XPATH="--x-includes=%{_prefix}/include --x-libraries=%{_prefix}/%{_lib}" \
-  $CONFIGURE_TOP/configure --build=%{_target_platform} \\\
- 	--prefix=%{_prefix} \\\
+  $CONFIGURE_TOP/configure %{!?_legacy_autotools:--build=}%{_target_platform} \\\
+	%{?_program_prefix:--program-prefix=%{_program_prefix}} \\\
+	--prefix=%{_prefix} \\\
 	--exec-prefix=%{_exec_prefix} \\\
 	--bindir=%{_bindir} \\\
 	--sbindir=%{_sbindir} \\\
-- 
2.9.3 (Apple Git-75)

Actions: View | Diff

Attachments on bug 19902: 8729