| From 4335de1dfb7d2ec728427e07a54136b94a2d40f6 Mon Sep 17 00:00:00 2001 |
| From: Pavel Raiskup <praiskup@redhat.com> |
| Date: Fri, 17 Apr 2015 15:05:42 +0200 |
| Subject: 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. |
| |
| Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=4335de1dfb7d2ec728427e07a54136b94a2d40f6] |
| |
| Signed-off-by: Li Wang <li.wang@windriver.com> |
| Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| --- |
| NEWS | 6 ++++++ |
| m4/libtool.m4 | 17 +++++++++++++++-- |
| 2 files changed, 21 insertions(+), 2 deletions(-) |
| |
| diff --git a/NEWS b/NEWS |
| index d7ca434..71a932d 100644 |
| --- a/NEWS |
| +++ b/NEWS |
| @@ -7,6 +7,12 @@ NEWS - list of user-visible changes between releases of GNU Libtool |
| - LT_SYS_LIBRARY_PATH can be set in config.site, or at configure time |
| and persists correctly in the generated libtool script. |
| |
| +** 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 race condition in ltdl dryrun test that would cause spurious |
| diff --git a/m4/libtool.m4 b/m4/libtool.m4 |
| index 63acd09..6514196 100644 |
| --- a/m4/libtool.m4 |
| +++ b/m4/libtool.m4 |
| @@ -1497,9 +1497,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 |
| -- |
| 2.23.0 |
| |