[SCM] GNU Libtool branch, master, updated. v2.4.3-39-g81ab62f
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 81ab62f9031f97788065da8d9bf9f581c3c0715f (commit)
from 1acee63da4b98fecdb59b3ce4b67a4d5fbd21323 (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 81ab62f9031f97788065da8d9bf9f581c3c0715f
Author: Gary V. Vaughan g...@gnu.org
Date: Fri Nov 28 15:12:03 2014 +
configury: detect dlsym underscore prefix without dlopen self.
* m4/ltdl.m4 (LT_FUNC_DLSYM_USCORE): Compile, load and get the
address of a symbol from a separate loadable module, rather than
assuming dlopen self works.
* NEWS: Update.
Reported by KO Myung-Hun
Signed-off-by: Gary V. Vaughan g...@gnu.org
---
Summary of changes:
NEWS |3 ++
m4/ltdl.m4 | 108 ---
2 files changed, 98 insertions(+), 13 deletions(-)
diff --git a/NEWS b/NEWS
index 2782511..963c8a2 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,9 @@ NEWS - list of user-visible changes between releases of GNU
Libtool
including old versions of the snippet directory, and gnulib's
version of the argz module and supporting files.
+ - LT_FUNC_DLYSM_USCORE now works correctly on systems that don't
+support self dlopen()ing.
+
** Important incompatible changes:
- LT_LIB_DLLOAD no longer prepends -ldl or -ldld to LIBS, causing
diff --git a/m4/ltdl.m4 b/m4/ltdl.m4
index 4119844..5dc1e80 100644
--- a/m4/ltdl.m4
+++ b/m4/ltdl.m4
@@ -793,20 +793,102 @@ dnl AC_DEFUN([AC_LTDL_SYMBOL_USCORE], [])
# LT_FUNC_DLSYM_USCORE
#
AC_DEFUN([LT_FUNC_DLSYM_USCORE],
-[AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl
+[AC_REQUIRE([_LT_COMPILER_PIC])dnl for lt_prog_compiler_wl
+AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl for lt_cv_sys_symbol_underscore
+AC_REQUIRE([LT_SYS_MODULE_EXT])dnl for libltdl_cv_shlibext
if test yes = $lt_cv_sys_symbol_underscore; then
- if test yes = $libltdl_cv_func_dlopen ||
- test yes = $libltdl_cv_lib_dl_dlopen; then
- AC_CACHE_CHECK([whether we have to add an underscore for dlsym],
- [libltdl_cv_need_uscore],
- [libltdl_cv_need_uscore=unknown
- save_LIBS=$LIBS
- LIBS=$LIBS $LIBADD_DLOPEN
- _LT_TRY_DLOPEN_SELF(
- [libltdl_cv_need_uscore=no], [libltdl_cv_need_uscore=yes],
- [], [libltdl_cv_need_uscore=cross])
- LIBS=$save_LIBS
- ])
+ if test yes = $libltdl_cv_func_dlopen || test yes =
$libltdl_cv_lib_dl_dlopen; then
+AC_CACHE_CHECK([whether we have to add an underscore for dlsym],
+ [libltdl_cv_need_uscore],
+ [libltdl_cv_need_uscore=unknown
+ dlsym_uscore_save_LIBS=$LIBS
+ LIBS=$LIBS $LIBADD_DLOPEN
+ libname=conftmod # stay within 8.3 filename limits!
+ cat $libname.$ac_ext _LT_EOF
+[#line $LINENO configure
+#include confdefs.h
+/* When -fvisibility=hidden is used, assume the code has been annotated
+ correspondingly for the symbols needed. */
+#if defined __GNUC__ (((__GNUC__ == 3) (__GNUC_MINOR__ = 3)) ||
(__GNUC__ 3))
+int fnord () __attribute__((visibility(default)));
+#endif
+int fnord () { return 42; }]
+_LT_EOF
+
+ # ltfn_module_cmds module_cmds
+ # Execute tilde-delimited MODULE_CMDS with environment primed for
+ # ${module_cmds} or ${archive_cmds} type content.
+ ltfn_module_cmds ()
+ {( # subshell avoids polluting parent global environment
+ module_cmds_save_ifs=$IFS; IFS='~'
+ for cmd in @S|@1; do
+IFS=$module_cmds_save_ifs
+libobjs=$libname.$ac_objext; lib=$libname$libltdl_cv_shlibext
+rpath=/not-exists; soname=$libname$libltdl_cv_shlibext;
output_objdir=.
+major=; versuffix=; verstring=; deplibs=
+ECHO=echo; wl=$lt_prog_compiler_wl; allow_undefined_flag=
+eval $cmd
+ done
+ IFS=$module_cmds_save_ifs
+ )}
+
+ # Compile a loadable module using libtool macro expansion results.
+ $CC $pic_flag -c $libname.$ac_ext
+ ltfn_module_cmds ${module_cmds:-$archive_cmds}
+
+ # Try to fetch fnord with dlsym().
+ libltdl_dlunknown=0; libltdl_dlnouscore=1; libltdl_dluscore=2
+ cat conftest.$ac_ext _LT_EOF
+[#line $LINENO configure
+#include confdefs.h
+#if HAVE_DLFCN_H
+#include dlfcn.h
+#endif
+#include stdio.h
+#ifndef RTLD_GLOBAL
+# ifdef DL_GLOBAL
+#define RTLD_GLOBAL DL_GLOBAL
+# else
+#define RTLD_GLOBAL 0
+# endif
+#endif
+#ifndef RTLD_NOW
+# ifdef DL_NOW
+#define RTLD_NOW DL_NOW
+# else
+#define RTLD_NOW 0
+# endif
+#endif
[SCM] GNU Libtool branch, master, updated. v2.4.3-41-gbb7cef9
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 bb7cef9d97d6fdb2d8ee5350a82fb39b0ff8513d (commit) via 0995849d00a6f6f52a2b940c0e19b1f4a0891e50 (commit) from 81ab62f9031f97788065da8d9bf9f581c3c0715f (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 bb7cef9d97d6fdb2d8ee5350a82fb39b0ff8513d Author: Tijl Coosemans t...@freebsd.org Date: Fri Nov 28 15:57:07 2014 + libtool: use a modern library version scheme for freebsd-elf. * m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER): Adopt downstream patch used by FreeBSD for versioned library filenames. * build-aux/ltmain.in (func_mode_link): Replace conflicting freebsd-elf version_type case branches with a single calculation setting major and versuffix to match downstream FreeBSD. Signed-off-by: Gary V. Vaughan g...@gnu.org commit 0995849d00a6f6f52a2b940c0e19b1f4a0891e50 Author: Tijl Coosemans t...@freebsd.org Date: Fri Nov 28 15:51:34 2014 + libtool: split sco version into its own type. * m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER): Set version type to sco for sco based hosts. * build-aux/ltmain.in (func_mode_link): Accept new sco version_type as equivalent to freebsd-elf. Signed-off-by: Gary V. Vaughan g...@gnu.org --- Summary of changes: build-aux/ltmain.in | 14 ++ m4/libtool.m4 |4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in index 85e2809..a72c007 100644 --- a/build-aux/ltmain.in +++ b/build-aux/ltmain.in @@ -6834,13 +6834,13 @@ func_mode_link () # case $version_type in # correct linux to gnu/linux during the next big refactor - darwin|linux|osf|windows|none) + darwin|freebsd-elf|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result age=$number_minor revision=$number_revision ;; - freebsd-aout|freebsd-elf|qnx|sunos) + freebsd-aout|qnx|sunos) current=$number_major revision=$number_minor age=0 @@ -6926,8 +6926,9 @@ func_mode_link () ;; freebsd-elf) - major=.$current - versuffix=.$current + func_arith $current - $age + major=.$func_arith_result + versuffix=$major.$age.$revision ;; irix | nonstopux) @@ -6990,6 +6991,11 @@ func_mode_link () versuffix=.$current ;; + sco) + major=.$current + versuffix=.$current + ;; + sunos) major=.$current versuffix=.$current.$revision diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 6143541..da22139 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -2543,7 +2543,7 @@ freebsd* | dragonfly*) version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' need_version=no need_lib_prefix=no ;; @@ -2909,7 +2909,7 @@ sysv4*MP*) ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' hooks/post-receive -- GNU Libtool
[SCM] GNU Libtool branch, master, updated. v2.4.3-43-gcbeefbc
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 cbeefbc8f0ac527f7c7f14cbc8b3fc9de0ff2b77 (commit)
via 16bcf1884998a56963d81c796d138b0107fffce7 (commit)
from bb7cef9d97d6fdb2d8ee5350a82fb39b0ff8513d (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 cbeefbc8f0ac527f7c7f14cbc8b3fc9de0ff2b77
Author: Tijl Coosemans t...@freebsd.org
Date: Fri Nov 28 16:46:56 2014 +
libtoolize: no need for umask 0 now that copying does not use tar.
The umask calls seem to be left over as a workaround for several
releases ago when libtoolize copied libltdl sources with the help
of tar. Now that we use cp or ln -s exclusively, this just
needlessly makes the files world writable; we should just respect
the users' own umask setting.
* libtoolize.in (func_copy): Remove umask 0 calls and simplify.
Signed-off-by: Gary V. Vaughan g...@gnu.org
commit 16bcf1884998a56963d81c796d138b0107fffce7
Author: Gary V. Vaughan g...@gnu.org
Date: Fri Nov 28 16:18:36 2014 +
maint: syntax-checks don't like ${ even in comments!
* m4/ltdl.m4: Fix a comment to appease syntax-check rules.
Signed-off-by: Gary V. Vaughan g...@gnu.org
---
Summary of changes:
libtoolize.in | 12 ++--
m4/ltdl.m4|2 +-
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/libtoolize.in b/libtoolize.in
index dbc6ac3..6e5eaca 100644
--- a/libtoolize.in
+++ b/libtoolize.in
@@ -392,11 +392,7 @@ func_copy ()
# Filters always take priority.
if test -n $my_filter; then
- if $opt_dry_run || {
- ( umask 0
-$SED -e $my_filter $my_srcfile $my_destfile
- ) /dev/null 21
-}
+ if $opt_dry_run || $SED -e $my_filter $my_srcfile $my_destfile
2/dev/null
then
func_notquiet_once $my_msg_var
if $opt_verbose; then
@@ -422,11 +418,7 @@ func_copy ()
my_copy_msg=$my_copy_type file '$my_destfile'
$opt_verbose my_copy_msg=$my_copycmd $my_srcfile $my_destdir
-if $opt_dry_run || {
-( umask 0
- $my_copycmd $my_srcfile $my_destfile
-) /dev/null 21
- }
+if $opt_dry_run || $my_copycmd $my_srcfile $my_destfile 2/dev/null
then
func_notquiet_hdr $my_msg_var $my_copy_msg
else
diff --git a/m4/ltdl.m4 b/m4/ltdl.m4
index 5dc1e80..dd34d49 100644
--- a/m4/ltdl.m4
+++ b/m4/ltdl.m4
@@ -817,7 +817,7 @@ _LT_EOF
# ltfn_module_cmds module_cmds
# Execute tilde-delimited MODULE_CMDS with environment primed for
- # ${module_cmds} or ${archive_cmds} type content.
+ # $module_cmds or $archive_cmds type content.
ltfn_module_cmds ()
{( # subshell avoids polluting parent global environment
module_cmds_save_ifs=$IFS; IFS='~'
hooks/post-receive
--
GNU Libtool
