aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Välimaa <wally@mageia.org>2020-01-16 19:06:01 +0200
committerJani Välimaa <wally@mageia.org>2020-01-16 19:06:01 +0200
commitb7a1dc4c517b6b0d7d6de859619c2a17255a2f09 (patch)
tree7ffc042ed8b030806ba1be50798b7a4e3b5f37fc
parent68d86b1abce4422d4581a8c3557f8da61a29e4a1 (diff)
downloadrpm-setup-b7a1dc4c517b6b0d7d6de859619c2a17255a2f09.tar
rpm-setup-b7a1dc4c517b6b0d7d6de859619c2a17255a2f09.tar.gz
rpm-setup-b7a1dc4c517b6b0d7d6de859619c2a17255a2f09.tar.bz2
rpm-setup-b7a1dc4c517b6b0d7d6de859619c2a17255a2f09.tar.xz
rpm-setup-b7a1dc4c517b6b0d7d6de859619c2a17255a2f09.zip
build.macros: drop legacy libtoolize calls from configure macros
-rw-r--r--NEWS1
-rw-r--r--build.macros.in10
2 files changed, 2 insertions, 9 deletions
diff --git a/NEWS b/NEWS
index 1cb53d1..4a7749a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+- 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
- __cputoolize
diff --git a/build.macros.in b/build.macros.in
index 25aed15..5d532dd 100644
--- a/build.macros.in
+++ b/build.macros.in
@@ -213,10 +213,6 @@ export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%o
%__fix_libtool_from_moving_options_after_libs @RPMVENDORDIR@/fix-libtool-from-moving-options-after-libs
%__fix_dlsearch_path_in_libtool_for_multilib @RPMVENDORDIR@/fix-dlsearch-path-in-libtool-for-multilib
-%__libtoolize libtoolize
-
-%__libtoolize_configure %{?__libtoolize:(cd $CONFIGURE_TOP; [ ! -f configure.in -a ! -f configure.ac ] || %{__libtoolize} --copy --force)}
-
%before_configure \
%set_build_flags \
CONFIGURE_TOP="${CONFIGURE_TOP:-.}"; \
@@ -229,10 +225,7 @@ export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%o
# This is an improved version of %configure (from PLD team).
%main_configure \
%before_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_TOP/configure %{!?_legacy_autotools:--build=}%{_target_platform} \\\
+ $CONFIGURE_TOP/configure --build=%{_build} \\\
%{?_program_prefix:--program-prefix=%{_program_prefix}} \\\
--prefix=%{_prefix} \\\
--exec-prefix=%{_exec_prefix} \\\
@@ -250,7 +243,6 @@ export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%o
# Implement configure shims
%configure \
- %define _legacy_autotools 1 \
%main_configure
%configure2_5x \