diff options
| author | Jani Välimaa <wally@mageia.org> | 2020-01-16 19:13:15 +0200 |
|---|---|---|
| committer | Jani Välimaa <wally@mageia.org> | 2020-01-16 19:13:15 +0200 |
| commit | f8280d3cd69710d5f6e5bf80bb44900a8ebe46de (patch) | |
| tree | c15502aa541dbf80144127cee17dbd4003dda15a | |
| parent | e55cbefbb04d619e35d598b4d67c1be6bedafa9a (diff) | |
| download | rpm-setup-f8280d3cd69710d5f6e5bf80bb44900a8ebe46de.tar rpm-setup-f8280d3cd69710d5f6e5bf80bb44900a8ebe46de.tar.gz rpm-setup-f8280d3cd69710d5f6e5bf80bb44900a8ebe46de.tar.bz2 rpm-setup-f8280d3cd69710d5f6e5bf80bb44900a8ebe46de.tar.xz rpm-setup-f8280d3cd69710d5f6e5bf80bb44900a8ebe46de.zip | |
build.macros: sync configure macro with rpm upstream
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | build.macros.in | 11 |
2 files changed, 7 insertions, 5 deletions
@@ -1,4 +1,5 @@ - build.macros: replace configure2_5x with configure macro + - sync configure macro with rpm upstream - build.macros: drop legacy libtoolize calls from configure macros - build.macros: drop legacy --x-includes= and --x-libraries= from configure macros - build.macros: drop deprecated and unused macros diff --git a/build.macros.in b/build.macros.in index 3256813..3981550 100644 --- a/build.macros.in +++ b/build.macros.in @@ -222,12 +222,13 @@ export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%o %{__fix_libtool_from_moving_options_after_libs} $CONFIGURE_TOP ; \ %{__fix_dlsearch_path_in_libtool_for_multilib} $CONFIGURE_TOP %{_lib} -# This is an improved version of %configure (from PLD team). +# This is an improved version of %configure (originally from PLD team). +%_configure $CONFIGURE_TOP/configure %configure \ - %before_configure ; \ - $CONFIGURE_TOP/configure --build=%{_build} \\\ - %{?_program_prefix:--program-prefix=%{_program_prefix}} \\\ - --prefix=%{_prefix} \\\ + %{before_configure}; \ + %{_configure} --host=%{_host} --build=%{_build} + --program-prefix=%{?_program_prefix} \\\ + --disable-dependency-tracking \\\ --exec-prefix=%{_exec_prefix} \\\ --bindir=%{_bindir} \\\ --sbindir=%{_sbindir} \\\ |