[SCM] GNU Libtool branch, master, updated. v2.4.2-309-g6c51572
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project GNU Libtool. The branch, master has been updated via 6c51572ae0748629da0144ed5b640a3e7abc35d3 (commit) via 670283ee701b1e8b781e8250ccf4911443e683eb (commit) via 25b3dda2161d2893c0d642ace0ec13297dfbe835 (commit) via 9477e33ef07253559bf95eef379e2ecc740201c7 (commit) via 55262b6fe432ee00ef2acf8b76d37b9ed459cf46 (commit) via f8061eabaf08f75f5f0430a59bb20f4344838b0e (commit) via 3f951c3817755277513f144c5b0f8b488ddff56b (commit) from 55fd801b97a669ba5336836ce7b8971b8673a517 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 6c51572ae0748629da0144ed5b640a3e7abc35d3 Author: Gary V. Vaughan g...@gnu.org Date: Fri Oct 19 12:23:39 2012 +0700 bootstrap: always extract only the first AC_CONFIG_MACRO_DIR arg. Previous versions of bootstrap concatenated all the arguments to multiple invocations of AC_CONFIG_MACRO_DIR when extracting the macro_dir directory name. This change enforces correct and consistent behaviour. * libtoolize.in (func_require_macro_dir): Use the new func_extract_trace_first function to make sure the first argument is always used. (func_require_aux_dir, func_require_gnulib_mk) (func_require_source_base): Future proof these functions against multiple invocations or additional arguments to the macros they trace. Signed-off-by: Gary V. Vaughan g...@gnu.org commit 670283ee701b1e8b781e8250ccf4911443e683eb Author: Gary V. Vaughan g...@gnu.org Date: Fri Oct 19 12:09:37 2012 +0700 bootstrap: extract *first* ACLOCAL_AMFLAGS -I argument. * bootstrap (func_require_macro_dir): .* is greedy, so _G_sed_scan as it was will always return the last -I argument, which is wrong. Move to a shell loop to ensure we always get the first -I argument if any. (code from libtoolize.in). Signed-off-by: Gary V. Vaughan g...@gnu.org commit 25b3dda2161d2893c0d642ace0ec13297dfbe835 Author: Gary V. Vaughan g...@gnu.org Date: Fri Oct 19 14:12:59 2012 +0700 bootstrap: use short gnu.org urls consistently. * bootstrap.conf (buildreq): Use gnu.org/s/ style urls to match the ones added automatically by the main bootstrap script. Signed-off-by: Gary V. Vaughan g...@gnu.org commit 9477e33ef07253559bf95eef379e2ecc740201c7 Author: Gary V. Vaughan g...@gnu.org Date: Fri Oct 19 12:32:25 2012 +0700 libtoolize: fix a misspelled variable name. * libtoolize.in (func_require_am_macro_dir): The loop uses _G_arg not _G_opt. Now spelled correctly. Signed-off-by: Gary V. Vaughan g...@gnu.org commit 55262b6fe432ee00ef2acf8b76d37b9ed459cf46 Author: Gary V. Vaughan g...@gnu.org Date: Fri Oct 19 12:23:39 2012 +0700 tests: always extract only the first AC_CONFIG_MACRO_DIR arg. Previous releases of libtoolize used the final invocation when there were several, and after the rewrite over extract-trace, all the invocation directories were concatenated. This change enforces correct and consistent behaviour. * tests/libtoolize.at (multiple AC_CONFIG_MACRO_DIR invocation): New test. * build-aux/extract-trace (func_extract_trace_first): New function for clients that source this file, which returns only the first argument to the first invocation of the named macros. * libtoolize.in (func_require_ac_macro_dir): Use it to make sure the first argument is always used. (func_require_ac_aux_dir, func_require_ac_ltdl_dir) (func_require_ac_ltdl_options): Future proof these functions against multiple invocations or additional arguments to the macros they trace. * News (Important incompatible changes): Note change in semantics. Reported by Eric Blake. Signed-off-by: Gary V. Vaughan g...@gnu.org commit f8061eabaf08f75f5f0430a59bb20f4344838b0e Author: Gary V. Vaughan g...@gnu.org Date: Fri Oct 19 12:23:39 2012 +0700 tests: always extract only the first ACLOCAL_AMFLAGS include arg. * tests/libtoolize.at (libtoolize ACLOCAL_AMFLAGS extraction): New test. * libtoolize.in (func_check_macros): Display the correct advice when ACLOCAL_AMFLAGS specifies a macrodir, but AC_CONFIG_MACRO_DIR does not. Signed-off-by: Gary V. Vaughan g...@gnu.org commit 3f951c3817755277513f144c5b0f8b488ddff56b Author: Gary V. Vaughan g...@gnu.org Date: Fri Oct 19 12:07:38 2012 +0700 doc: add a missing period following @xref. * doc/libtool.texi: Silence a warning by adding back a missing period. Signed-off-by: Gary V. Vaughan g...@gnu.org
[SCM] GNU Libtool branch, master, updated. v2.4.2-311-g0dd94ed
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project GNU Libtool.
The branch, master has been updated
via 0dd94ed521e52ca901e845b39bbc33f16174a325 (commit)
via 2fc9d079d637ba1abd1d1e1ab7fe5c1a59b8f785 (commit)
from 6c51572ae0748629da0144ed5b640a3e7abc35d3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 0dd94ed521e52ca901e845b39bbc33f16174a325
Author: Peter Rosin p...@lysator.liu.se
Date: Fri Oct 19 17:19:50 2012 +0200
libtool: parse dumpbin -headers to get symbols exported from implibs
* m4/libtool.m4 (_LT_CMD_GLOBAL_SYMBOLS) [MSVC]: Extract symbols
imported from DLLs by import libraries in the Microsoft dumpbin
wrapper.
(LT_PATH_NM): Add -headers option if dumpbin is the located name
lister to feed the above new code.
* NEWS: Update.
Signed-off-by: Peter Rosin p...@lysator.liu.se
commit 2fc9d079d637ba1abd1d1e1ab7fe5c1a59b8f785
Author: Peter Rosin p...@lysator.liu.se
Date: Fri Oct 19 11:51:12 2012 +0200
libtool: make func_win32_libid work when the name lister is MS dumpbin
* m4/libtool.m4 (_LT_CHECK_MAGIC_METHOD) [MSVC]: Use
func_win32_libid as file_magic_cmd when the name lister
is MS dumpbin.
(_LT_CMD_GLOBAL_SYMBOLS): Export the new veriable nm_interface
to the libtool script.
* build-aux/ltmain.in (func_cygming_gnu_implib_p)
(func_cygming_ms_implib_p): Move up to before...
(func_win32_libid): ...which now uses them to determine if
the object is an import library when the nm_interface is
MS dumpbin.
* NEWS: Update.
Signed-off-by: Peter Rosin p...@lysator.liu.se
---
Summary of changes:
NEWS|7 +++-
build-aux/ltmain.in | 71 ++-
m4/libtool.m4 | 12 ++---
3 files changed, 55 insertions(+), 35 deletions(-)
diff --git a/NEWS b/NEWS
index ad1d8f9..d0107a9 100644
--- a/NEWS
+++ b/NEWS
@@ -55,8 +55,11 @@ NEWS - list of user-visible changes between releases of GNU
Libtool
(e.g. the ability to parse `var+=append') as $CONFIG_SHELL, libtool
will now correctly fallback to using only vanilla shell features
instead of failing with a parse at startup.
- - Fix a bug in the wrapper for using Microsoft dumpbin as name lister
-which could lead to broken symbol listings in some corner cases.
+ - Correctly recognize import libraries when Microsoft dumpbin is used
+as the name lister and extend the dumpbin wrapper to find symbols
+in import libraries using the -headers option of dumpbin. Also fix a
+bug in the dumpbin wrapper which could lead to broken symbol listings
+in some corner cases.
** Important incompatible changes:
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
index bcfc04c..ed4a4b1 100644
--- a/build-aux/ltmain.in
+++ b/build-aux/ltmain.in
@@ -2904,6 +2904,32 @@ static const void *lt_preloaded_setup() {
fi
}
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+ $debug_cmd
+
+ func_to_tool_file $1 func_convert_file_msys_to_w32
+ func_cygming_gnu_implib_tmp=`$NM $func_to_tool_file_result | eval
$global_symbol_pipe | $EGREP '
(_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+ test -n $func_cygming_gnu_implib_tmp
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+ $debug_cmd
+
+ func_to_tool_file $1 func_convert_file_msys_to_w32
+ func_cygming_ms_implib_tmp=`$NM $func_to_tool_file_result | eval
$global_symbol_pipe | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+ test -n $func_cygming_ms_implib_tmp
+}
+
# func_win32_libid arg
# return the library type of file 'arg'
#
@@ -2925,9 +2951,20 @@ func_win32_libid ()
# Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
if eval $OBJDUMP -f $1 | $SED -e '10q' 2/dev/null |
$EGREP 'file format (pei*-i386(.*architecture:
i386)?|pe-arm-wince|pe-x86-64)' /dev/null; then
- func_to_tool_file $1 func_convert_file_msys_to_w32
- win32_nmres=`eval $NM -f posix -A \$func_to_tool_file_result\ |
- $SED -n -e '
+ case $nm_interface in
+ MS dumpbin)
+ if func_cygming_ms_implib_p $1 ||
+ func_cygming_gnu_implib_p $1
+ then
+ win32_nmres=import
+ else
+ win32_nmres=
+ fi
+ ;;
+ *)
+ func_to_tool_file
[SCM] GNU Libtool branch, master, updated. v2.4.2-314-g05bd3f8
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project GNU Libtool. The branch, master has been updated via 05bd3f8b862effa756b2bd1aa52a6926914290cd (commit) via fad11c9e66e1c33cfb0617312ba23369a285 (commit) via 4d644c39d835fe92878f1aace081ba46187fe4ca (commit) from 0dd94ed521e52ca901e845b39bbc33f16174a325 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 05bd3f8b862effa756b2bd1aa52a6926914290cd Author: Gary V. Vaughan g...@gnu.org Date: Fri Oct 19 16:50:01 2012 +0700 tests: make sure AC_CONFIG_MACRO_DIR is still supported. * tests/old-m4-iface.at (AC_CONFIG_MACRO_DIR support): New test. Make sure we continue to support AC_CONFIG_MACRO_DIR using projects. Signed-off-by: Gary V. Vaughan g...@gnu.org commit fad11c9e66e1c33cfb0617312ba23369a285 Author: Gary V. Vaughan g...@gnu.org Date: Fri Oct 19 16:21:27 2012 +0700 libtoolize: select the first directory from AC_CONFIG_MACRO_DIRS. * tests/libtoolize.at (multiple AC_CONFIG_MACRO_DIRS directories): New test to ensure multiple directory arguments mork correctly. * libtoolize.in (func_require_ac_macro_dir): Use expr to discard any additional space delimited entries in the first AC_CONFIG_MACRO_DIRS argument. * bootstrap (func_require_macro_dir): Likewise. Signed-off-by: Gary V. Vaughan g...@gnu.org commit 4d644c39d835fe92878f1aace081ba46187fe4ca Author: Gary V. Vaughan g...@gnu.org Date: Thu Oct 18 20:37:03 2012 +0700 libtoolize: migrate to new AC_CONFIG_MACRO_DIRS api. * libtoolize.in (func_install_pkgmacro_files): Uee AC_CONFIG_MACRO_DIRS. (func_check_macros): Advise using AC_CONFIG_MACRO_DIRS. (require_ac_macro_dir): Give priority to AC_CONFIG_MACRO_DIRS. (require_macro_dir): Likewise. * bootstrap: Give priority to AC_CONFIG_MACRO_DIRS. * configure.ac: Define dummy AC_CONFIG_MACRO_DIRS for older Autotools, that is allow bootstrap with current release versions. Use AC_CONFIG_MACRO_DIRS instead of AC_CONFIG_MACRO_DIR. * tests/testsuite.at: Source build-aux/extract-trace for access to func_extract_trace. (LT_AT_ACLOCAL): Use it to get the AC_CONFIG_MACRO_DIRS argument to pass manually to aclocal for compatibility with old Automake. Add a fallback AC_CONFIG_MACRO_DIRS definition to acinclude.m4 in the test directory. (LT_AT_AUTORECONF): Likewise. * tests/cdemo.at, tests/configure-iface.at, tests/darwin.at, tests/demo.at, tests/depdemo.at, tests/early-libtool.at, tests/libtoolize.at, tests/mdemo.at, tests/no-executables.at, tests/nonrecursive.at, tests/old-ltdl-iface.at, tests/recursive.at, tests/subproject.at, tests/tagdemo.at, tests/template.at: Likewise. * doc/libtool.texi: Update. * NEWS: Update. Signed-off-by: Gary V. Vaughan g...@gnu.org --- Summary of changes: NEWS | 11 bootstrap|8 +++- configure.ac | 11 +++- doc/libtool.texi | 14 +++--- libtoolize.in| 23 ++ tests/cdemo.at |2 +- tests/configure-iface.at |6 +- tests/darwin.at |2 +- tests/demo.at|2 +- tests/depdemo.at |2 +- tests/early-libtool.at |4 +- tests/libtoolize.at | 116 - tests/mdemo.at |2 +- tests/no-executables.at |2 +- tests/nonrecursive.at|2 +- tests/old-ltdl-iface.at |4 +- tests/old-m4-iface.at| 31 tests/recursive.at |2 +- tests/subproject.at |2 +- tests/tagdemo.at |2 +- tests/template.at|4 +- tests/testsuite.at | 24 +- 22 files changed, 191 insertions(+), 85 deletions(-) diff --git a/NEWS b/NEWS index d0107a9..78b9ed3 100644 --- a/NEWS +++ b/NEWS @@ -79,6 +79,17 @@ NEWS - list of user-visible changes between releases of GNU Libtool releases took the first ACLOCAL_AMFLAGS argument, but the last invocation of AC_CONFIG_MACRO_DIRS. + - The libtoolize program now advises use of the new Autoconf +AC_CONFIG_MACRO_DIRS declaration. If you follow that advice, all +your developers will need at least autoconf-2.70 and automake-1.13 +to rebootstrap your probject. If you still need to support +bootstrap with older Autotools, then you should add the following +to your configure.ac file: + +m4_ifndef([AC_CONFIG_MACRO_DIRS], +[m4_define([AC_CONFIG_MACRO_DIRS], +m4_defn([AC_CONFIG_MACRO_DIR]))]) + New in 2.4.2
