aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Välimaa <wally@mageia.org>2020-01-16 19:08:32 +0200
committerJani Välimaa <wally@mageia.org>2020-01-16 19:08:32 +0200
commite55cbefbb04d619e35d598b4d67c1be6bedafa9a (patch)
tree4e552b4c29ec9459b7035377ca3eff8aa1956607
parentb7a1dc4c517b6b0d7d6de859619c2a17255a2f09 (diff)
downloadrpm-setup-e55cbefbb04d619e35d598b4d67c1be6bedafa9a.tar
rpm-setup-e55cbefbb04d619e35d598b4d67c1be6bedafa9a.tar.gz
rpm-setup-e55cbefbb04d619e35d598b4d67c1be6bedafa9a.tar.bz2
rpm-setup-e55cbefbb04d619e35d598b4d67c1be6bedafa9a.tar.xz
rpm-setup-e55cbefbb04d619e35d598b4d67c1be6bedafa9a.zip
build.macros: replace configure2_5x with configure macro
-rw-r--r--NEWS1
-rw-r--r--build.macros.in9
2 files changed, 4 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index 4a7749a..8c14108 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+- build.macros: replace configure2_5x with configure macro
- 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 5d532dd..3256813 100644
--- a/build.macros.in
+++ b/build.macros.in
@@ -223,7 +223,7 @@ export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%o
%{__fix_dlsearch_path_in_libtool_for_multilib} $CONFIGURE_TOP %{_lib}
# This is an improved version of %configure (from PLD team).
-%main_configure \
+%configure \
%before_configure ; \
$CONFIGURE_TOP/configure --build=%{_build} \\\
%{?_program_prefix:--program-prefix=%{_program_prefix}} \\\
@@ -241,12 +241,9 @@ export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%o
--mandir=%{_mandir} \\\
--infodir=%{_infodir}
-# Implement configure shims
-%configure \
- %main_configure
-
%configure2_5x \
- %main_configure
+ %{warn:%%configure2_5x is deprecated, use %%configure instead} \
+ %configure
# Maximum number of CPU's to use when building, 0 for unlimited.
%_smp_ncpus_max 0