[pkgsrc/trunk]: pkgsrc/devel/libtool Update to libtool 1.5.24:

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/76b4374ecc64
branches:  trunk
changeset: 533335:76b4374ecc64
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Sep 15 12:11:44 2007 +0000

description:
Update to libtool 1.5.24:
- fix regression on DragonFly [patched before]
- don't remove paths to uninstalled libs [patched before]
- initial support for Sun compilers on Linux
- better suport for GNU/kNetBSD and GNU/kFreeBSD
- fixes for GCC multilib on x86_64 and similiar system.
- documentation for --tag.
- getconf ARG_MAX is used to find maximum argument length.

diffstat:

 devel/libtool/Makefile.common           |     4 +-
 devel/libtool/distinfo                  |    14 +-
 devel/libtool/patches/manual-libtool.m4 |   355 ++++++++--
 devel/libtool/patches/patch-ab          |  1012 +++++++++++++++++++++---------
 devel/libtool/patches/patch-ac          |    58 +-
 devel/libtool/patches/patch-ad          |  1012 +++++++++++++++++++++---------
 6 files changed, 1685 insertions(+), 770 deletions(-)

diffs (truncated from 3079 to 300 lines):

diff -r 82398e279ca2 -r 76b4374ecc64 devel/libtool/Makefile.common
--- a/devel/libtool/Makefile.common     Sat Sep 15 12:04:24 2007 +0000
+++ b/devel/libtool/Makefile.common     Sat Sep 15 12:11:44 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.70 2007/04/18 16:31:18 tnn Exp $
+# $NetBSD: Makefile.common,v 1.71 2007/09/15 12:11:44 joerg Exp $
 
 ###########################################################################
 ###########################################################################
@@ -23,7 +23,7 @@
 ###########################################################################
 ###########################################################################
 
-DISTNAME=      libtool-1.5.22
+DISTNAME=      libtool-1.5.24
 CATEGORIES=    devel pkgtools
 MASTER_SITES=  ${MASTER_SITE_GNU:=libtool/}
 
diff -r 82398e279ca2 -r 76b4374ecc64 devel/libtool/distinfo
--- a/devel/libtool/distinfo    Sat Sep 15 12:04:24 2007 +0000
+++ b/devel/libtool/distinfo    Sat Sep 15 12:11:44 2007 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.69 2006/12/15 11:28:51 dmcmahill Exp $
+$NetBSD: distinfo,v 1.70 2007/09/15 12:11:44 joerg Exp $
 
-SHA1 (libtool-1.5.22.tar.gz) = 17353e66aeaac80ae188ea0a3a90609550ce3254
-RMD160 (libtool-1.5.22.tar.gz) = 7cbe793ee0509908daac928b4dc3a0f16f7293bf
-Size (libtool-1.5.22.tar.gz) = 2921483 bytes
+SHA1 (libtool-1.5.24.tar.gz) = b4c994f1bf4a76d2b0c1d0a6f54d16598c15f3db
+RMD160 (libtool-1.5.24.tar.gz) = e682fe6570c71d93ad65e0c6c77cb6558846f27d
+Size (libtool-1.5.24.tar.gz) = 2919557 bytes
 SHA1 (patch-aa) = 4c979de3439dfffa48295e094c1aee40c7e79fa6
-SHA1 (patch-ab) = 146f7c6a3c4b0863246cee70f0294765472bfbc8
-SHA1 (patch-ac) = 40d18dfe690ad7b76f1dae98df55fdc7e46ccd10
-SHA1 (patch-ad) = 70b560a1f419938a6d93358f3f74805df13de3b1
+SHA1 (patch-ab) = 5af35d31ba99ef2965de1ba4cb4614466c08d86d
+SHA1 (patch-ac) = 52f22f3f7a58e22d2240d0c6bb77455783ee5d70
+SHA1 (patch-ad) = 7b197a91d5d7b74c50648ef53e2e8116160189f0
diff -r 82398e279ca2 -r 76b4374ecc64 devel/libtool/patches/manual-libtool.m4
--- a/devel/libtool/patches/manual-libtool.m4   Sat Sep 15 12:04:24 2007 +0000
+++ b/devel/libtool/patches/manual-libtool.m4   Sat Sep 15 12:11:44 2007 +0000
@@ -1,19 +1,9 @@
-$NetBSD: manual-libtool.m4,v 1.20 2006/12/15 11:28:51 dmcmahill Exp $
+$NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
 
---- libtool.m4.orig    2005-12-18 21:53:17.000000000 +0000
-+++ libtool.m4 2006-12-12 21:49:49.000000000 +0000
-@@ -249,5 +249,9 @@
-   esac
- done
--cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+
-+# Return the actual command name, not our pkgsrc wrapper name because several
-+# decisions are made only based on compiler names
-+new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
-+cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- ])
+--- libtool.m4.orig    2007-06-24 04:19:11.000000000 +0200
++++ libtool.m4
+@@ -402,11 +402,11 @@ else
  
-@@ -393,9 +397,9 @@
    if test "X$echo" = Xecho; then
      # We didn't find a better echo, so look for alternatives.
 -    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
@@ -25,41 +15,67 @@
 +      echo='print -r -'
      elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
         test "X$CONFIG_SHELL" != X/bin/ksh; then
-@@ -1290,4 +1294,5 @@
+       # If we have ksh, try running configure again with it.
+@@ -1351,6 +1351,7 @@ beos*)
+ bsdi[[45]]*)
    version_type=linux
    need_version=no
 +  need_lib_prefix=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
-@@ -1415,13 +1420,14 @@
-     esac
-   fi
--  version_type=freebsd-$objformat
--  case $version_type in
--    freebsd-elf*)
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+@@ -1449,7 +1450,7 @@ freebsd1*)
+   dynamic_linker=no
+   ;;
+ 
+-freebsd* | dragonfly*)
++freebsd*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
+   if test -x /usr/bin/objformat; then
+@@ -1463,7 +1464,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}'
-+  version_type=linux
-+  case $objformat in
-+    elf*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+      soname_spec='${libname}${release}${shared_ext}$major'
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
        need_version=no
        need_lib_prefix=no
        ;;
--    freebsd-*)
--      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+    *)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
-       need_version=yes
-       ;;
-@@ -1441,5 +1447,5 @@
-     hardcode_into_libs=yes
-     ;;
--  freebsd*) # from 4.6 on
-+  *) # from 4.6 on, and DragonFly
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-@@ -1519,10 +1525,5 @@
+@@ -1493,6 +1494,16 @@ freebsd* | dragonfly*)
+   esac
+   ;;
+ 
++dragonfly*)
++  version_type=linux # XXX tv this should be =linux; current selection has problems
++  need_version=no
++  need_lib_prefix=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
++
+ gnu*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -1561,15 +1572,22 @@ interix[[3-9]]*)
+   hardcode_into_libs=yes
+   ;;
+ 
++interix3*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  dynamic_linker='Interix 3.x ld.so'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
+ irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
@@ -71,7 +87,9 @@
 +    *) version_type=irix ;;
    esac
    need_lib_prefix=no
-@@ -1601,9 +1602,9 @@
+   need_version=no
+@@ -1634,11 +1652,11 @@ linux* | k*bsd*-gnu)
+   ;;
  
  netbsd*)
 -  version_type=sunos
@@ -83,30 +101,65 @@
 +    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
-@@ -1636,5 +1637,5 @@
+   else
+@@ -1663,13 +1681,14 @@ nto-qnx*)
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  dynamic_linker='QNX libc.so'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+   ;;
  
  openbsd*)
 -  version_type=sunos
 +  version_type=linux
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
-@@ -1644,5 +1645,5 @@
+   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+@@ -1677,7 +1696,7 @@ openbsd*)
+     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
      *)                         need_version=no  ;;
    esac
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -1833,7 +1834,5 @@
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+@@ -1871,9 +1890,7 @@ if test -f "$ltmain" && test -n "$tagnam
+ 
        case $tagname in
        CXX)
 -      if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 -          ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 -          (test "X$CXX" != "Xg++"))) ; then
-+        if test -n "$CXX" && test "X$CXX" != "Xno"; then
++      if test -n "$CXX" && test "X$CXX" != "Xno" ; then
          AC_LIBTOOL_LANG_CXX_CONFIG
        else
-@@ -2581,20 +2580,8 @@
+         tagname=""
+@@ -2392,6 +2409,10 @@ interix[[3-9]]*)
+   lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+   ;;
+ 
++interix3*)
++  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
++  ;;
++
+ irix5* | irix6* | nonstopux*)
+   case $LD in
+   *-32|*"-32 ") libmagic=32-bit;;
+@@ -2422,7 +2443,7 @@ newos6*)
+   ;;
+ 
+ nto-qnx*)
+-  lt_cv_deplibs_check_method=unknown
++  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|S\.a)$'
+   ;;
+ 
+ openbsd*)
+@@ -2629,21 +2650,10 @@ AC_DEFUN([AC_LIBTOOL_CXX],
+ # ---------------
  AC_DEFUN([_LT_AC_LANG_CXX],
  [AC_REQUIRE([AC_PROG_CXX])
 -AC_REQUIRE([_LT_AC_PROG_CXXCPP])
@@ -125,24 +178,37 @@
 -  AC_PROG_CXXCPP
 -fi
 -])# _LT_AC_PROG_CXXCPP
--
+ 
  # AC_LIBTOOL_F77
  # --------------
-@@ -2733,5 +2720,5 @@
+@@ -2781,7 +2791,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [
+ AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
  [AC_LANG_PUSH(C++)
  AC_REQUIRE([AC_PROG_CXX])
 -AC_REQUIRE([_LT_AC_PROG_CXXCPP])
 +AC_REQUIRE([AC_PROG_CXXCPP])
  
  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-@@ -3081,5 +3068,5 @@
-           _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
--          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj 
${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj 
${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-           _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o 
$lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-           ;;
-@@ -3378,12 +3365,27 @@
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+@@ -3294,6 +3304,16 @@ case $host_os in
+     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+     _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname 
${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+     ;;
++  interix3*)
++    # Oy, what a hack.
++    # Because shlibs are not compiled -fPIC due to broken code, we must
++    # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
++    # all libraries, leading to runtime relocations -- slow and very
++    # memory consuming.  To do this, we pick a random 256KB-aligned
++    # start address between 0x50000000 and 0x6ffc0000 at link time.
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file 
$wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++    ;;
+   irix5* | irix6*)
+     case $cc_basename in
+       CC*)
+@@ -3447,14 +3467,29 @@ case $host_os in
+     ;;
    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 +      # a.out is quite broken and goes directly to ld
@@ -172,18 +238,43 @@
 -    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
      ;;
    openbsd2*)
-@@ -3873,4 +3875,10 @@
-   ;;
+     # C++ shared libraries are fairly broken
+@@ -3767,6 +3802,11 @@ case $host_os in
+     # FIXME: insert proper C++ library support
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no