diff options
| author | Neal Gompa <ngompa13@gmail.com> | 2017-07-30 15:34:26 -0400 |
|---|---|---|
| committer | Neal Gompa <ngompa13@gmail.com> | 2017-07-30 15:34:26 -0400 |
| commit | 574eace7cad124e7602b69b76b6e2fb26da9630e (patch) | |
| tree | 7664beb44263b1b6fc6ef723ded9ae7071be4535 | |
| parent | 18458568d8708203ae0499ad79b9456efd6a9ced (diff) | |
| download | rpm-setup-574eace7cad124e7602b69b76b6e2fb26da9630e.tar rpm-setup-574eace7cad124e7602b69b76b6e2fb26da9630e.tar.gz rpm-setup-574eace7cad124e7602b69b76b6e2fb26da9630e.tar.bz2 rpm-setup-574eace7cad124e7602b69b76b6e2fb26da9630e.tar.xz rpm-setup-574eace7cad124e7602b69b76b6e2fb26da9630e.zip | |
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.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | build.macros.in | 30 |
2 files changed, 7 insertions, 25 deletions
@@ -1,3 +1,5 @@ +- Unify %configure macros into a single %configure macro + Version 2.21 - 26 July 2017, by Thierry Vignaud - support split debugsources in our macros diff --git a/build.macros.in b/build.macros.in index 65b17f9..fdd6f29 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} \\\ |