[SCM] GNU Libtool branch, master, updated. v2.4.4-12-g663f919
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 663f9192417ce9defbdf5aa0c9f3b2dc08c9256d (commit)
via 72293c99520a7dd77d08241ae697409d052e38b4 (commit)
from 440fee60c991e19e0ce66f98c5ad06d5607c766f (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 663f9192417ce9defbdf5aa0c9f3b2dc08c9256d
Author: Gary V. Vaughan g...@gnu.org
Date: Thu Dec 11 22:53:34 2014 +
maint: fix syntax-check failures.
* m4/m4.m4 (AC_PROG_GNU_M4): Reverse some test arguments for
sc_prohibit_test_const_follows_var.
Remove some spurious braces for
sc_useless_braces_in_variable_drefs.
Signed-off-by: Gary V. Vaughan g...@gnu.org
commit 72293c99520a7dd77d08241ae697409d052e38b4
Author: Gary V. Vaughan g...@gnu.org
Date: Thu Dec 11 22:58:08 2014 +
bootstrap: sync with upstream.
* gl/build-aux/extract-trace (func_find_tool): Quote a bare
variable expansion in a test argument.
* bootstrap: Regenerate.
Signed-off-by: Gary V. Vaughan g...@gnu.org
---
Summary of changes:
bootstrap |2 +-
gl/build-aux/extract-trace |2 +-
m4/m4.m4 | 10 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/bootstrap b/bootstrap
index a6ffd54..94e3385 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2312,7 +2312,7 @@ func_find_tool ()
for _G_dir in $PATH; do
IFS=$_G_find_tool_save_IFS
_G_progpath=$_G_dir/$_G_prog
- test -r $_G_progpath {
+ test -r $_G_progpath {
_G_curver=`func_tool_version_number $_G_progpath`
case $_G_bestver,$_G_curver in
,)
diff --git a/gl/build-aux/extract-trace b/gl/build-aux/extract-trace
index 14b0f0a..a3d0bc4 100755
--- a/gl/build-aux/extract-trace
+++ b/gl/build-aux/extract-trace
@@ -169,7 +169,7 @@ func_find_tool ()
for _G_dir in $PATH; do
IFS=$_G_find_tool_save_IFS
_G_progpath=$_G_dir/$_G_prog
- test -r $_G_progpath {
+ test -r $_G_progpath {
_G_curver=`func_tool_version_number $_G_progpath`
case $_G_bestver,$_G_curver in
,)
diff --git a/m4/m4.m4 b/m4/m4.m4
index 80bd42c..ba9b4df 100644
--- a/m4/m4.m4
+++ b/m4/m4.m4
@@ -31,8 +31,8 @@ AC_PATH_PROGS_FEATURE_CHECK([M4], [m4 gm4 gnum4],
# false positive strstr.
ac_snippet=change'quote(,)in''dir(if''def,mac,bug)'
ac_snippet=${ac_snippet}pat'subst(a,\(b\)\|\(a\),\1)d'nl
- ac_snippet=${ac_snippet}${as_nl}if'else(in''dex(..wi.d.,.d.),-1,bug)'
- ac_snippet=${ac_snippet}${as_nl}if'else(in''dex(dnl
+ ac_snippet=$ac_snippet${as_nl}if'else(in''dex(..wi.d.,.d.),-1,bug)'
+ ac_snippet=$ac_snippet${as_nl}if'else(in''dex(dnl
;:11-:12-:12-:12-:12-:12-:12-:12-:12.:12.:12.:12.:12.:12.:12.:12.:12-,dnl
:12-:12-:12-:12-:12-:12-:12-:12-),-1,,strstr-bug2)'
test -z `$ac_path_M4 -F conftest.m4f /dev/null 21` \
@@ -51,15 +51,15 @@ Glibc 2.9 - 2.12 and GNU M4 1.4.11 - 1.4.15 have another
strstr bug.])])])
*--gnu*) ac_cv_prog_gnu_m4_gnu=yes ;;
*) ac_cv_prog_gnu_m4_gnu=no ;;
esac])
- if test $ac_cv_prog_gnu_m4_gnu = yes; then
+ if test yes = $ac_cv_prog_gnu_m4_gnu; then
M4_GNU=--gnu
else
M4_GNU=
fi
AC_SUBST([M4_GNU])
- if test x$ac_had_posixly_correct = xyes; then
+ if test yes = $ac_had_posixly_correct; then
POSIXLY_CORRECT=:
-if test $ac_cv_prog_gnu_m4_gnu = no; then
+if test no = $ac_cv_prog_gnu_m4_gnu; then
AC_MSG_WARN([the version of M4 that was found does not support -g])
AC_MSG_WARN([using it with POSIXLY_CORRECT set may cause problems])
fi
hooks/post-receive
--
GNU Libtool
[SCM] GNU Libtool branch, master, updated. v2.4.4-13-g0827956
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 08279564ff4143059f3f728f9401b5d541f0bd1e (commit)
from 663f9192417ce9defbdf5aa0c9f3b2dc08c9256d (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 08279564ff4143059f3f728f9401b5d541f0bd1e
Author: Pavel Raiskup prais...@redhat.com
Date: Thu Dec 11 21:49:19 2014 +
libtool: support LT_SYS_LIBRARY_PATH for adjusting bad guesses.
Revert 8728e07 and 440fee6.
Some GNU/Linux distributions install libraries into /lib64 (or
/usr/lib64) on 64-bit machines, while /lib (/usr/lib
respectively) stays for multilib variant. Other distributions
keep /usr/lib for 64-bit variant and reserve other directory for
multilib. Detection of what approach a given system uses is
difficult, however, especially because Glibc's ldconfig does not
report the full and correct list of search paths. Allow the user
to adjust Libtools heuristically determined search paths with
the new LT_SYS_LIBRARY_PATH environment variable at both
compile-time, when libtool is called, and at configure time.
* m4/libtool.m4 (_LT_PREPARE_MUNGE_PATH_LIST): Define a new
function to munge a libtool path list according to a user
supplied colon-delimited path.
(_LT_SYS_DYNAMIC_LINKER): Require _LT_PREPARE_MUNGE_PATH_LIST.
Mark LT_SYS_LIBRARY_PATH as precious to autoconf (to survive
automatic autoreconf).
Call the new func_munge_path_list function on
sys_lib_dlsearch_path_spec - this propagates results to
generated libtool script.
(_LT_CONFIG): Expand _LT_PREPARE_MUNGE_PATH_LIST into generated
libtool script.
* build-aux/ltmain.in (func_mode_link): Call it to adjust
sys_lib_dlsearch_path according to LT_SYS_LIBRARY_PATH.
* doc/libtool.texi: Document new LT_SYS_LIBRARY_PATH.
* doc/notes.texi: Likewise.
* NEWS: Update.
References:
http://thread.gmane.org/gmane.comp.gnu.libtool.general/8339/focus=8345
Signed-off-by: Gary V. Vaughan g...@gnu.org
---
Summary of changes:
NEWS|6 ++--
build-aux/ltmain.in |3 ++
doc/libtool.texi| 21 +++
doc/notes.texi | 15 +-
m4/libtool.m4 | 72 --
5 files changed, 97 insertions(+), 20 deletions(-)
diff --git a/NEWS b/NEWS
index 6d48d28..87926bd 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,9 @@ NEWS - list of user-visible changes between releases of GNU
Libtool
- Libtoolize searches for the best available M4 on the user PATH at
runtime, rather than settling for the first one found.
+ - Support munging sys_lib_dlsearch_path_spec with LT_SYS_LIBRARY_PATH
+environment variable.
+
** Bug fixes:
- Bail out at configure time if the installed M4 is not sufficient
@@ -24,9 +27,6 @@ NEWS - list of user-visible changes between releases of GNU
Libtool
ia64-hp-hpux*, because the default system runtime loader path does
not contain them.
- - For various GNU/Linux (and other GNU OSes) on 64bit glibc/ELF hosts,
-explicit /lib64 and /usr/lib64 rpaths are no longer necessary.
-
* Noteworthy changes in release 2.4.4 (2014-11-29) [stable]
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
index a72c007..42048df 100644
--- a/build-aux/ltmain.in
+++ b/build-aux/ltmain.in
@@ -5525,6 +5525,9 @@ func_mode_link ()
eval sys_lib_search_path=\$sys_lib_search_path_spec\
eval sys_lib_dlsearch_path=\$sys_lib_dlsearch_path_spec\
+# Definition is injected by LT_CONFIG during libtool generation.
+func_munge_path_list sys_lib_dlsearch_path $LT_SYS_LIBRARY_PATH
+
func_dirname $output /
output_objdir=$func_dirname_result$objdir
func_to_tool_file $output_objdir/
diff --git a/doc/libtool.texi b/doc/libtool.texi
index 90aeb8f..0632225 100644
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -2419,6 +2419,27 @@ Program to use rather than checking for @command{mt},
the Manifest Tool.
Only used on Cygwin/MS-Windows at the moment.
@end defvar
+@defvar LT_SYS_LIBRARY_PATH
+Libtool has heuristics for the system search path for runtime-loaded
+libraries. If the guessed default does not match the setup of the host
+system, this variable can be used to modify that path list, as follows
+(@code{LT_SYS_LIBRARY_PATH} is a colon-delimited list like @code{PATH}):
+@itemize @bullet
+@item @code{path:}
+The heuristically determined paths will be appened after the trailing
+colon;
+@item @code{:path}
+The heuristically determined paths will be prepended before the leading
+colon;
