Patches making libtool-2.4-1 build under GNU/Hurd
merge 603971 612204
found 612204 2.4-1
thanks
Package: libtool
Version: 2.4-1
Severity: important
Tags: patch
User: debian-hurd@lists.debian.org
Usertags: hurd
Updated patches to make libtool-2.4 build under GNU/Hurd and the
corresponding series file.
The first defines shlibpath_overrides_runpath for gnu.
The second disables the test 102 of a low setting of max_cmd_len since
it has no meaning under GNU/Hurd.
The third updates the previous link_all_deplibs patch adding gnu to the
host-os list combining the patch in #603971. Therefore the two bugs are
merged.
link_all_deplibs.patch
deplib_binary.patch
define_shlibpath_overrides_runpath4hurd.patch
netbsdelf.patch
version_type.patch
nopic-mips.patch
deplibs_test_disable.patch
disable-link-order2.patch
deplibs-ident.patch
tagdemo-libfoo.patch
disable_cmdline_wrap4hurd.patch
# shlibpath_overrides_runpath is set to 'unknown' in libtool.m4
# and not defined under $host_os ="gnu"
# This patch make the tests/*demo* run.
--- libtool-2.4/libltdt/m4/libtool.m4.orig 2011-02-03 21:33:56.000000000 +0100
+++ libtool-2.4/libltdl/m4/libtool.m4 2011-02-03 21:43:46.000000000 +0100
@@ -2325,6 +2325,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
# This test is broken for hurd-i386
# Skip for $host_os = "gnu", since max_cmd_len=-1 to indicate that
# max_cmd_len is not limited under GNU Hurd.
#
--- libtool-2.4/tests/cmdline_wrap.at.orig 2010-05-20 23:18:41.000000000 +0200
+++ libtool-2.4/tests/cmdline_wrap.at 2011-02-06 11:08:29.000000000 +0100
@@ -30,6 +30,9 @@
m4_ifdef([AT_CAPTURE_FILE],
[AT_CAPTURE_FILE([testsuite.log])])
+# Setting low max_cmd_len on "hurd-386" does not make sense"
+AT_CHECK([if test "$host_os" == "gnu" ; then exit 77; fi])
+
sed 's,max_cmd_len=.*,max_cmd_len="24",' < $LIBTOOL > libtool
chmod +x libtool
LIBTOOL=`pwd`/libtool
## Do not link against deplibs. This is not needed for shared libs
## on atleast ELF systems since those already know which libs they
## need themself. This seems to break a few things and will be fixed
## in a better way in a future upstream version.
Index: libtool-2.4/libltdl/config/ltmain.m4sh
===================================================================
--- libtool-2.4.orig/libltdl/config/ltmain.m4sh 2011-03-27 21:50:31.000000000 +0000
+++ libtool-2.4/libltdl/config/ltmain.m4sh 2011-03-27 21:52:59.000000000 +0000
@@ -5322,7 +5322,10 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+ link)
+ libs="$deplibs %DEPLIBS%"
+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+ ;;
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
Index: libtool-2.4/libltdl/m4/libtool.m4
===================================================================
--- libtool-2.4.orig/libltdl/m4/libtool.m4 2010-09-22 08:41:19.000000000 +0000
+++ libtool-2.4/libltdl/m4/libtool.m4 2011-03-27 22:00:19.000000000 +0000
@@ -4499,6 +4499,9 @@
;;
esac
;;
+ linux* | k*bsd*-gnu | gnu*)
+ _LT_TAGVAR(link_all_deplibs, $1)=no
+ ;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -4562,6 +4565,9 @@
openbsd*)
with_gnu_ld=no
;;
+ linux* | k*bsd*-gnu | gnu*)
+ _LT_TAGVAR(link_all_deplibs, $1)=no
+ ;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
@@ -4961,6 +4967,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
+ _LT_TAGVAR(link_all_deplibs, $1)=no
else
# not using gcc
if test "$host_cpu" = ia64; then
Reply to: