diff options
Diffstat (limited to 'devel/libtool')
| -rw-r--r-- | devel/libtool/Makefile.common | 4 | ||||
| -rw-r--r-- | devel/libtool/distinfo | 4 | ||||
| -rw-r--r-- | devel/libtool/patches/patch-ab | 64 |
3 files changed, 61 insertions, 11 deletions
diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common index 51743268c1b..0cce4e61b70 100644 --- a/devel/libtool/Makefile.common +++ b/devel/libtool/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.9 2001/04/18 18:08:29 skrll Exp $ +# $NetBSD: Makefile.common,v 1.10 2001/05/09 10:24:11 agc Exp $ # DISTNAME= libtool-ml-20010219 PKGPFX= ${DISTNAME:C/ml-/1.4./} -PKGREV= nb5 +PKGREV= nb6 WRKSRC= ${WRKDIR}/libtool-ml CATEGORIES= devel pkgtools MASTER_SITES= ${MASTER_SITE_LOCAL} diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo index 64977bd1a0b..3609d3a8754 100644 --- a/devel/libtool/distinfo +++ b/devel/libtool/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.3 2001/05/08 13:38:41 skrll Exp $ +$NetBSD: distinfo,v 1.4 2001/05/09 10:24:11 agc Exp $ SHA1 (libtool-ml-20010219.tar.gz) = e8a2da617bd6cd2adddc6693a1e7be0eceefcac1 Size (libtool-ml-20010219.tar.gz) = 720382 bytes SHA1 (patch-aa) = 5524bcb4b3ec3faf79e903134ddcb6c8d3dfefe7 -SHA1 (patch-ab) = 86bc59afc6fc678b6ac9cae131fbf8631c45f724 +SHA1 (patch-ab) = 8e7c5b6e330ea5d5104874dedb046dd3d053dff6 SHA1 (patch-ac) = 85ea8ee09d9cf2d2ea005042538466b68d754722 SHA1 (patch-ad) = 8ca40b71f51a294fc4120ea75c3ee156c2f58abe SHA1 (patch-ae) = a390e23d205f7cd1a9f533427e63f636ee7ef58d diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab index 0b4f9c77b45..4baa2dd5f35 100644 --- a/devel/libtool/patches/patch-ab +++ b/devel/libtool/patches/patch-ab @@ -1,8 +1,58 @@ -$NetBSD: patch-ab,v 1.20 2001/04/03 17:06:17 skrll Exp $ +$NetBSD: patch-ab,v 1.21 2001/05/09 10:24:11 agc Exp $ --- ltmain.sh.orig Mon Feb 19 05:05:23 2001 -+++ ltmain.sh -@@ -2397,7 +2397,7 @@ ++++ ltmain.sh Wed May 9 11:13:29 2001 +@@ -484,7 +484,14 @@ + # Blanks in the command may have been stripped by the calling shell, + # but not from the CC environment variable when ltconfig was run. + "`$echo $CC` "*) ;; +- *) ++ *) base_compiler=`echo $base_compile | awk '{ print $1 }'` ++ case $base_compiler in ++ *cc) tagname=CC ;; ++ *++) tagname=CXX ;; ++ esac ;; ++ esac ++ fi ++ if test -n "$available_tags" && test -z "$tagname"; then + for z in $available_tags; do + if grep "^### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then + # Evaluate the configuration. +@@ -514,8 +521,6 @@ + # else + # echo "$modename: using $tagname tagged configuration" + fi +- ;; +- esac + fi + + objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` +@@ -1423,7 +1428,14 @@ + # Blanks in the command may have been stripped by the calling shell, + # but not from the CC environment variable when ltconfig was run. + "`$echo $CC` "*) ;; +- *) ++ *) base_compiler=`echo $base_compile | awk '{ print $1 }'` ++ case $base_compiler in ++ *cc) tagname=CC ;; ++ *++) tagname=CXX ;; ++ esac ;; ++ esac ++ fi ++ if test -n "$available_tags" && test -z "$tagname"; then + for z in $available_tags; do + if grep "^### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then + # Evaluate the configuration. +@@ -1453,8 +1465,6 @@ + # else + # echo "$modename: using $tagname tagged configuration" + fi +- ;; +- esac + fi + + if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then +@@ -2397,7 +2407,7 @@ # Check that each of the things are valid numbers. case "$current" in @@ -11,7 +61,7 @@ $NetBSD: patch-ab,v 1.20 2001/04/03 17:06:17 skrll Exp $ *) $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -@@ -2406,7 +2406,7 @@ +@@ -2406,7 +2416,7 @@ esac case "$revision" in @@ -20,7 +70,7 @@ $NetBSD: patch-ab,v 1.20 2001/04/03 17:06:17 skrll Exp $ *) $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -@@ -2415,7 +2415,7 @@ +@@ -2415,7 +2425,7 @@ esac case "$age" in @@ -29,7 +79,7 @@ $NetBSD: patch-ab,v 1.20 2001/04/03 17:06:17 skrll Exp $ *) $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -@@ -2612,6 +2612,9 @@ +@@ -2612,6 +2622,9 @@ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) # these systems don't actually have a c library (as such)! ;; @@ -39,7 +89,7 @@ $NetBSD: patch-ab,v 1.20 2001/04/03 17:06:17 skrll Exp $ *) # Add libc to deplibs on all other systems if necessary. if test $build_libtool_need_lc = "yes"; then -@@ -2771,6 +2774,40 @@ +@@ -2771,6 +2784,40 @@ fi done # Gone through all deplibs. ;; |