pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel update to libtool 1.5.26 using libtool/patches/m...
details: https://anonhg.NetBSD.org/pkgsrc/rev/1bea511e5aff
branches: trunk
changeset: 550335:1bea511e5aff
user: chuck <chuck%pkgsrc.org@localhost>
date: Wed Nov 19 01:26:52 2008 +0000
description:
update to libtool 1.5.26 using libtool/patches/manual.README procedure:
fixes linking problems on darwin (problems with nmedit, see
http://pogma.com/2008/02/13/nmedit-libtool-exported-symbols/ )
diffstat:
devel/libtool-base/Makefile | 4 +-
devel/libtool/Makefile.common | 4 +-
devel/libtool/distinfo | 12 +-
devel/libtool/patches/manual-libtool.m4 | 77 +++++-----
devel/libtool/patches/patch-ab | 161 ++++++++++++-----------
devel/libtool/patches/patch-ad | 212 ++++++++++++++++++++-----------
6 files changed, 269 insertions(+), 201 deletions(-)
diffs (truncated from 1792 to 300 lines):
diff -r 71e53fe85224 -r 1bea511e5aff devel/libtool-base/Makefile
--- a/devel/libtool-base/Makefile Wed Nov 19 01:16:24 2008 +0000
+++ b/devel/libtool-base/Makefile Wed Nov 19 01:26:52 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2008/07/11 11:27:24 joerg Exp $
+# $NetBSD: Makefile,v 1.84 2008/11/19 01:26:52 chuck Exp $
###########################################################################
###########################################################################
@@ -26,7 +26,7 @@
.include "../../devel/libtool/Makefile.common"
PKGNAME= ${DISTNAME:S/-/-base-/}
-PKGREVISION= 6
+PKGREVISION= 7
SVR4_PKGNAME= ltoob
COMMENT= Generic shared library support script (the script itself)
diff -r 71e53fe85224 -r 1bea511e5aff devel/libtool/Makefile.common
--- a/devel/libtool/Makefile.common Wed Nov 19 01:16:24 2008 +0000
+++ b/devel/libtool/Makefile.common Wed Nov 19 01:26:52 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.72 2007/11/11 11:35:48 martti Exp $
+# $NetBSD: Makefile.common,v 1.73 2008/11/19 01:26:52 chuck Exp $
###########################################################################
###########################################################################
@@ -23,7 +23,7 @@
###########################################################################
###########################################################################
-DISTNAME= libtool-1.5.24
+DISTNAME= libtool-1.5.26
CATEGORIES= devel pkgtools
MASTER_SITES= ${MASTER_SITE_GNU:=libtool/}
diff -r 71e53fe85224 -r 1bea511e5aff devel/libtool/distinfo
--- a/devel/libtool/distinfo Wed Nov 19 01:16:24 2008 +0000
+++ b/devel/libtool/distinfo Wed Nov 19 01:26:52 2008 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.71 2007/10/07 13:59:43 joerg Exp $
+$NetBSD: distinfo,v 1.72 2008/11/19 01:26:52 chuck Exp $
-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 (libtool-1.5.26.tar.gz) = 4c1738351736562a951a345e24f233d00953ec0a
+RMD160 (libtool-1.5.26.tar.gz) = 4d1d7dd0308b98e8f590723ae5daddb8da49ac11
+Size (libtool-1.5.26.tar.gz) = 2961939 bytes
SHA1 (patch-aa) = 4c979de3439dfffa48295e094c1aee40c7e79fa6
-SHA1 (patch-ab) = ee24f61f6825e352c421c3b887cd9cf1eb1884c2
+SHA1 (patch-ab) = 4b3befd3cf5629e3b46b4bd100b697d10089d434
SHA1 (patch-ac) = 52f22f3f7a58e22d2240d0c6bb77455783ee5d70
-SHA1 (patch-ad) = d2f3979009c4d77541ba0df85425e4a20b16564d
+SHA1 (patch-ad) = d3636017fc09a571df6ecb57b7b988867bbbd4ce
diff -r 71e53fe85224 -r 1bea511e5aff devel/libtool/patches/manual-libtool.m4
--- a/devel/libtool/patches/manual-libtool.m4 Wed Nov 19 01:16:24 2008 +0000
+++ b/devel/libtool/patches/manual-libtool.m4 Wed Nov 19 01:26:52 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: manual-libtool.m4,v 1.22 2007/10/07 12:31:59 joerg Exp $
+$NetBSD: manual-libtool.m4,v 1.23 2008/11/19 01:26:52 chuck Exp $
Local pkgsrc changes:
- override the basename to point to the actual backend compiler,
@@ -9,9 +9,9 @@
- Interix3 support
- disable static linkage on OS X by default
---- libtool.m4.orig 2007-06-24 04:19:11.000000000 +0200
-+++ libtool.m4
-@@ -248,8 +248,11 @@ AC_DEFUN([_LT_CC_BASENAME],
+--- libtool.m4.orig 2008-02-01 11:26:47.000000000 -0500
++++ libtool.m4 2008-11-18 16:37:04.000000000 -0500
+@@ -249,7 +249,10 @@
*) break;;
esac
done
@@ -23,8 +23,7 @@
])
- # _LT_COMPILER_BOILERPLATE
-@@ -402,11 +405,11 @@ else
+@@ -474,11 +477,11 @@
if test "X$echo" = Xecho; then
# We didn't find a better echo, so look for alternatives.
@@ -38,7 +37,7 @@
elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
test "X$CONFIG_SHELL" != X/bin/ksh; then
# If we have ksh, try running configure again with it.
-@@ -1351,6 +1354,7 @@ beos*)
+@@ -1427,6 +1430,7 @@
bsdi[[45]]*)
version_type=linux
need_version=no
@@ -46,7 +45,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -1449,7 +1453,7 @@ freebsd1*)
+@@ -1525,7 +1529,7 @@
dynamic_linker=no
;;
@@ -55,7 +54,7 @@
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
if test -x /usr/bin/objformat; then
-@@ -1463,7 +1467,7 @@ freebsd* | dragonfly*)
+@@ -1539,7 +1543,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
@@ -64,7 +63,7 @@
need_version=no
need_lib_prefix=no
;;
-@@ -1493,6 +1497,16 @@ freebsd* | dragonfly*)
+@@ -1569,6 +1573,16 @@
esac
;;
@@ -81,7 +80,7 @@
gnu*)
version_type=linux
need_lib_prefix=no
-@@ -1561,15 +1575,22 @@ interix[[3-9]]*)
+@@ -1637,15 +1651,22 @@
hardcode_into_libs=yes
;;
@@ -110,7 +109,7 @@
esac
need_lib_prefix=no
need_version=no
-@@ -1634,11 +1655,11 @@ linux* | k*bsd*-gnu)
+@@ -1710,11 +1731,11 @@
;;
netbsd*)
@@ -124,7 +123,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
-@@ -1663,13 +1684,14 @@ nto-qnx*)
+@@ -1739,13 +1760,14 @@
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -140,7 +139,7 @@
sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -1677,7 +1699,7 @@ openbsd*)
+@@ -1753,7 +1775,7 @@
openbsd3.3 | openbsd3.3.*) need_version=yes ;;
*) need_version=no ;;
esac
@@ -149,7 +148,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -1871,9 +1893,7 @@ if test -f "$ltmain" && test -n "$tagnam
+@@ -1954,9 +1976,7 @@
case $tagname in
CXX)
@@ -160,7 +159,7 @@
AC_LIBTOOL_LANG_CXX_CONFIG
else
tagname=""
-@@ -2392,6 +2412,10 @@ interix[[3-9]]*)
+@@ -2475,6 +2495,10 @@
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
;;
@@ -171,7 +170,7 @@
irix5* | irix6* | nonstopux*)
case $LD in
*-32|*"-32 ") libmagic=32-bit;;
-@@ -2422,7 +2446,7 @@ newos6*)
+@@ -2505,7 +2529,7 @@
;;
nto-qnx*)
@@ -180,7 +179,7 @@
;;
openbsd*)
-@@ -2629,21 +2653,10 @@ AC_DEFUN([AC_LIBTOOL_CXX],
+@@ -2712,21 +2736,10 @@
# ---------------
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
@@ -203,7 +202,7 @@
# AC_LIBTOOL_F77
# --------------
-@@ -2781,7 +2794,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [
+@@ -2864,7 +2877,7 @@
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
[AC_LANG_PUSH(C++)
AC_REQUIRE([AC_PROG_CXX])
@@ -212,7 +211,7 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -3294,6 +3307,16 @@ case $host_os in
+@@ -3350,6 +3363,16 @@
_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'
;;
@@ -229,7 +228,7 @@
irix5* | irix6*)
case $cc_basename in
CC*)
-@@ -3447,14 +3470,29 @@ case $host_os in
+@@ -3503,14 +3526,29 @@
;;
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -246,7 +245,9 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+- fi
+- # Workaround some broken pre-1.5 toolchains
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+ elif $CC -dumpspecs | grep -- '-lgcc -lc -lgcc' >/dev/null; then
+ # Workaround some broken pre-1.5 ELF toolchains
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
@@ -255,13 +256,11 @@
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ output_verbose_link_cmd='echo'
- fi
-- # Workaround some broken pre-1.5 toolchains
-- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
++ fi
;;
openbsd2*)
# C++ shared libraries are fairly broken
-@@ -3767,6 +3805,11 @@ case $host_os in
+@@ -3823,6 +3861,11 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -273,7 +272,7 @@
*)
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -3928,6 +3971,21 @@ if AC_TRY_EVAL(ac_compile); then
+@@ -3985,6 +4028,21 @@
esac
done
@@ -295,8 +294,8 @@
# Clean up.
rm -f a.out a.exe
else
-@@ -4966,9 +5024,11 @@ AC_MSG_CHECKING([for $compiler option to
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+@@ -5033,9 +5091,11 @@
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
;;
darwin* | rhapsody*)
- # PIC is the default on this platform
@@ -308,7 +307,7 @@
;;
*djgpp*)
# DJGPP does not support shared libraries at all
-@@ -4994,6 +5054,10 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5061,6 +5121,10 @@
;;
esac
;;
@@ -319,7 +318,7 @@
*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
-@@ -5072,6 +5136,8 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5139,6 +5203,8 @@
# This is c89, which is MS Visual C++ (no shared libs)
# Anyone wants to do a port?
;;
@@ -328,7 +327,7 @@
irix5* | irix6* | nonstopux*)
case $cc_basename in
CC*)
-@@ -5211,6 +5277,8 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5278,6 +5344,8 @@
;;
vxworks*)
;;
@@ -337,7 +336,7 @@
*)
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
;;
Home |
Main Index |
Thread Index |
Old Index