diff options
Diffstat (limited to 'patches/libtool-2.4.6/0001-libool.m4-add-ARFLAGS-variable.patch')
| -rw-r--r-- | patches/libtool-2.4.6/0001-libool.m4-add-ARFLAGS-variable.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/patches/libtool-2.4.6/0001-libool.m4-add-ARFLAGS-variable.patch b/patches/libtool-2.4.6/0001-libool.m4-add-ARFLAGS-variable.patch new file mode 100644 index 000000000..52e21f513 --- /dev/null +++ b/patches/libtool-2.4.6/0001-libool.m4-add-ARFLAGS-variable.patch @@ -0,0 +1,68 @@ +From: Pavel Raiskup <praiskup@redhat.com> +Date: Fri, 17 Apr 2015 15:05:42 +0200 +Subject: [PATCH] libool.m4: add ARFLAGS variable + +Libtool has used $AR_FLAGS since 2000-05-29 commit +8300de4c54e6f04f0d, Automake ARFLAGS since 2003-04-06 commit +a71b3490639831ca. Even though ARFLAGS is younger, it sounds like +better name according GNU Coding Standards. + +Related to bug#20082. + +* m4/libtool.m4 (_LT_PROG_AR): Copy ARFLAGS value into AR_FLAGS +variable if AR_FLAGS is not set. Add new _LT_DECL'ed variable +'lt_ar_flags' to keep the configure-time value of AR_FLAGS. The +new 'lt_ar_flags' is to be used as the default value for AR_FLAGS +at libtool-runtime. +* NEWS: Document. +--- + NEWS | 6 ++++++ + m4/libtool.m4 | 17 +++++++++++++++-- + 2 files changed, 21 insertions(+), 2 deletions(-) + +diff --git a/NEWS b/NEWS +index d7ca4341c393..590ce15ed5cd 100644 +--- a/NEWS ++++ b/NEWS +@@ -140,6 +140,12 @@ NEWS - list of user-visible changes between releases of GNU Libtool + + make check-local TESTSUITEFLAGS='-k "!expensive"' + ++** New features: ++ ++ - Libtool script now supports (configure-time and runtime) ARFLAGS ++ variable, which obsoletes AR_FLAGS. This is due to naming conventions ++ among other *FLAGS and to be consistent with Automake's ARFLAGS. ++ + ** Bug fixes: + + - Fix a long-standing latent bug in autom4te include path for autotests +diff --git a/m4/libtool.m4 b/m4/libtool.m4 +index a3bc337b79ad..2d6bda98fc92 100644 +--- a/m4/libtool.m4 ++++ b/m4/libtool.m4 +@@ -1493,9 +1493,22 @@ need_locks=$enable_libtool_lock + m4_defun([_LT_PROG_AR], + [AC_CHECK_TOOLS(AR, [ar], false) + : ${AR=ar} +-: ${AR_FLAGS=cru} + _LT_DECL([], [AR], [1], [The archiver]) +-_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) ++ ++# Use ARFLAGS variable as AR's operation code to sync the variable naming with ++# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have ++# higher priority because thats what people were doing historically (setting ++# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS ++# variable obsoleted/removed. ++ ++test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cru} ++lt_ar_flags=$AR_FLAGS ++_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)]) ++ ++# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override ++# by AR_FLAGS because that was never working and AR_FLAGS is about to die. ++_LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}], ++ [Flags to create an archive]) + + AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], + [lt_cv_ar_at_file=no |