diff options
author | skrll <skrll@pkgsrc.org> | 2002-03-26 16:31:27 +0000 |
---|---|---|
committer | skrll <skrll@pkgsrc.org> | 2002-03-26 16:31:27 +0000 |
commit | 8186bff76ab50b957df6116fcb0e36a3d8da5dba (patch) | |
tree | f22ff979e612f3f5512bc114140f5d6212af72f5 /devel | |
parent | d50aec5c421c5f0e2693803af8d16299b375929a (diff) | |
download | pkgsrc-8186bff76ab50b957df6116fcb0e36a3d8da5dba.tar.gz |
Fix a bug when inferring the CXX tag which meant that for certain
libraries the following could occur
- a.out platforms: c++rt0.o would be missing and therefore
global contstructors would not work.
- ELF platforms libstdc++ and libm would not be explicitly
linked in.
This affected notably libqt and explains the build failure of kdelibs2 on
arm32.
Bump PKGREVISION and require it.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/libtool/Makefile.common | 4 | ||||
-rw-r--r-- | devel/libtool/distinfo | 4 | ||||
-rw-r--r-- | devel/libtool/patches/patch-ab | 34 |
3 files changed, 24 insertions, 18 deletions
diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common index 62544e89c95..e2dd4b54b4f 100644 --- a/devel/libtool/Makefile.common +++ b/devel/libtool/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.19 2002/03/21 09:00:12 skrll Exp $ +# $NetBSD: Makefile.common,v 1.20 2002/03/26 16:31:28 skrll Exp $ # DISTNAME= libtool-ml-20010614 PKGPFX= ${DISTNAME:C/ml-/1.4./} -PKGREV= nb7 +PKGREV= nb8 WRKSRC= ${WRKDIR}/libtool-ml CATEGORIES= devel pkgtools MASTER_SITES= ${MASTER_SITE_LOCAL} diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo index c55b86cd02e..269d5ab2ff8 100644 --- a/devel/libtool/distinfo +++ b/devel/libtool/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.14 2002/03/21 09:00:13 skrll Exp $ +$NetBSD: distinfo,v 1.15 2002/03/26 16:31:28 skrll Exp $ SHA1 (libtool-ml-20010614.tar.gz) = ff746666737e420592c3017d65bf4c47f1430dac Size (libtool-ml-20010614.tar.gz) = 784246 bytes SHA1 (patch-ac-new) = 61196acaa12edee0b1209b2ba7c6414453bfa438 SHA1 (patch-aa) = c085c1dd5a3f3f56bfa279076724fc13311d83bb -SHA1 (patch-ab) = 42f3b5de63994cc69a230cfcabdb6df47cd00a0e +SHA1 (patch-ab) = 1d23b17b2d1ce914e5665b3cbc0adc6590fca827 SHA1 (patch-ac) = 61196acaa12edee0b1209b2ba7c6414453bfa438 SHA1 (patch-ad) = 6aab76688d0f55648e35adc45a3492ba9c87acfb SHA1 (patch-ae) = 03de2a4fc9d828d62c6e6126ecf2dbbfeb1d82ea diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab index 1008ad82658..fda1723c1d8 100644 --- a/devel/libtool/patches/patch-ab +++ b/devel/libtool/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.24 2002/03/01 15:40:44 skrll Exp $ +$NetBSD: patch-ab,v 1.25 2002/03/26 16:31:28 skrll Exp $ ---- ltmain.sh.orig Mon Feb 18 17:38:48 2002 +--- ltmain.sh.orig Thu Jun 14 05:06:50 2001 +++ ltmain.sh @@ -211,6 +211,8 @@ --mode) prevopt="--mode" prev=mode ;; @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.24 2002/03/01 15:40:44 skrll Exp $ --quiet | --silent) show=: ;; -@@ -494,11 +496,18 @@ +@@ -494,11 +496,21 @@ # command doesn't match the default compiler. if test -n "$available_tags" && test -z "$tagname"; then case $base_compile in @@ -25,7 +25,10 @@ $NetBSD: patch-ab,v 1.24 2002/03/01 15:40:44 skrll Exp $ + *) base_compiler=`echo $base_compile | awk '{ print $1 }'` + case $base_compiler in + *cc) tagname=CC ;; -+ *++) tagname=CXX ;; ++ *++) ++ tagname=CXX ++ eval "`sed -n -e '/^### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`" ++ ;; + esac ;; + esac + fi @@ -33,7 +36,7 @@ $NetBSD: patch-ab,v 1.24 2002/03/01 15:40:44 skrll Exp $ for z in $available_tags; do if grep "^### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then # Evaluate the configuration. -@@ -528,8 +537,6 @@ +@@ -528,8 +540,6 @@ # else # echo "$modename: using $tagname tagged configuration" fi @@ -42,7 +45,7 @@ $NetBSD: patch-ab,v 1.24 2002/03/01 15:40:44 skrll Exp $ fi objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` -@@ -1528,11 +1535,18 @@ +@@ -1528,11 +1538,21 @@ # command doesn't match the default compiler. if test -n "$available_tags" && test -z "$tagname"; then case $base_compile in @@ -56,7 +59,10 @@ $NetBSD: patch-ab,v 1.24 2002/03/01 15:40:44 skrll Exp $ + *) base_compiler=`echo $base_compile | awk '{ print $1 }'` + case $base_compiler in + *cc) tagname=CC ;; -+ *++) tagname=CXX ;; ++ *++) ++ tagname=CXX ++ eval "`sed -n -e '/^### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`" ++ ;; + esac ;; + esac + fi @@ -64,7 +70,7 @@ $NetBSD: patch-ab,v 1.24 2002/03/01 15:40:44 skrll Exp $ for z in $available_tags; do if grep "^### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then # Evaluate the configuration. -@@ -1562,8 +1576,6 @@ +@@ -1562,8 +1582,6 @@ # else # echo "$modename: using $tagname tagged configuration" fi @@ -73,7 +79,7 @@ $NetBSD: patch-ab,v 1.24 2002/03/01 15:40:44 skrll Exp $ fi if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then -@@ -1619,9 +1631,11 @@ +@@ -1619,9 +1637,11 @@ # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do @@ -88,7 +94,7 @@ $NetBSD: patch-ab,v 1.24 2002/03/01 15:40:44 skrll Exp $ libs="$libs $deplib" done -@@ -1632,12 +1646,14 @@ +@@ -1632,12 +1652,14 @@ # $postdeps and mark them as special (i.e., whose duplicates are # not to be eliminated). pre_post_deps= @@ -109,7 +115,7 @@ $NetBSD: patch-ab,v 1.24 2002/03/01 15:40:44 skrll Exp $ pre_post_deps= fi -@@ -1861,9 +1877,11 @@ +@@ -1861,9 +1883,11 @@ tmp_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" @@ -124,7 +130,7 @@ $NetBSD: patch-ab,v 1.24 2002/03/01 15:40:44 skrll Exp $ tmp_libs="$tmp_libs $deplib" done elif test $linkmode != prog && test $linkmode != lib; then -@@ -1986,9 +2004,11 @@ +@@ -1986,9 +2010,11 @@ # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi @@ -139,7 +145,7 @@ $NetBSD: patch-ab,v 1.24 2002/03/01 15:40:44 skrll Exp $ tmp_libs="$tmp_libs $deplib" done # for deplib continue -@@ -2287,9 +2307,11 @@ +@@ -2287,9 +2313,11 @@ tmp_libs= for deplib in $dependency_libs; do newdependency_libs="$deplib $newdependency_libs" @@ -154,7 +160,7 @@ $NetBSD: patch-ab,v 1.24 2002/03/01 15:40:44 skrll Exp $ tmp_libs="$tmp_libs $deplib" done -@@ -5053,7 +5075,7 @@ +@@ -5053,7 +5081,7 @@ fi # Now prepare to actually exec the command. |