diff options
author | joerg <joerg> | 2009-12-18 22:11:10 +0000 |
---|---|---|
committer | joerg <joerg> | 2009-12-18 22:11:10 +0000 |
commit | b85757a353d79e371cacfbe2b4d1ab16065e0e54 (patch) | |
tree | 860947ffaf0130650011594945d32e5d0856268e | |
parent | c2fac04363e73cee38e409b0acfbc45b5715a4aa (diff) | |
download | pkgsrc-b85757a353d79e371cacfbe2b4d1ab16065e0e54.tar.gz |
Add some band aid for the not-yet-fully-analyzed issue with sh on
NetBSD. Install a prestine install.sh to not leak our modifications
into packages. Bump revision.
-rw-r--r-- | devel/libtool-base/Makefile | 6 | ||||
-rw-r--r-- | devel/libtool/distinfo | 4 | ||||
-rw-r--r-- | devel/libtool/patches/patch-ab | 25 |
3 files changed, 30 insertions, 5 deletions
diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile index 0de96bf6360..470f77a030b 100644 --- a/devel/libtool-base/Makefile +++ b/devel/libtool-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.89 2009/12/16 15:27:34 joerg Exp $ +# $NetBSD: Makefile,v 1.90 2009/12/18 22:11:10 joerg Exp $ ########################################################################### ########################################################################### @@ -26,7 +26,7 @@ .include "../../devel/libtool/Makefile.common" PKGNAME= ${DISTNAME:S/-/-base-/} -PKGREVISION= 1 +PKGREVISION= 2 SVR4_PKGNAME= ltoob COMMENT= Generic shared library support script (the script itself) @@ -36,6 +36,8 @@ CONFLICTS+= libtool<=1.3.5nb11 TEST_TARGET= check PLIST_VARS+= shlibtool +OVERRIDE_DIRDEPTH.install-sh= 1 + .if ${OPSYS} == "AIX" # always build libraries and executables that use the runtime linker. diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo index 209495cdfd6..781830f05bc 100644 --- a/devel/libtool/distinfo +++ b/devel/libtool/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.78 2009/12/17 00:53:52 joerg Exp $ +$NetBSD: distinfo,v 1.79 2009/12/18 22:11:10 joerg Exp $ SHA1 (libtool-2.2.6b.tar.gz) = 5afa73c8ef9ebe64bbb438a0f8779c9036e43c55 RMD160 (libtool-2.2.6b.tar.gz) = 02d8c1460946a1a0054b3ccb6b54d2404b53c2ef Size (libtool-2.2.6b.tar.gz) = 2347317 bytes SHA1 (patch-aa) = 84e916bf868ada2ebeffe940f03537fadd751751 -SHA1 (patch-ab) = 9253f12bc5e0c0576885a374c76b821c28ae2ede +SHA1 (patch-ab) = 7b88703844ca0b2906b1ad81a431a4bfc125445e SHA1 (patch-ac) = 8187bfc8436d2d7477a6a33c925c6d141804ad65 SHA1 (patch-ad) = 51ede8bef293d566cd359efa52e6cd04f4a380ec diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab index 9b02fe7ef41..43a574fa949 100644 --- a/devel/libtool/patches/patch-ab +++ b/devel/libtool/patches/patch-ab @@ -1,4 +1,7 @@ -$NetBSD: patch-ab,v 1.66 2009/12/17 00:53:52 joerg Exp $ +$NetBSD: patch-ab,v 1.67 2009/12/18 22:11:10 joerg Exp $ + +The last two chunks work around bugs in ksh on NetBSD. +The problem manifests with wl and no_builtin_flag containing newlines. --- configure.orig 2009-12-17 01:29:54.000000000 +0100 +++ configure @@ -835,3 +838,23 @@ $NetBSD: patch-ab,v 1.66 2009/12/17 00:53:52 joerg Exp $ lt_cv_prog_compiler_c_o_RC=yes +@@ -24427,6 +24441,9 @@ + LTCFLAGS='$LTCFLAGS' + compiler='$compiler_DEFAULT' + ++printf "%s" "$lt_prog_compiler_wl" > /dev/null ++printf "%s" "$lt_prog_compiler_no_builtin_flag" > /dev/null ++ + # Quote evaled strings. + for var in SED \ + GREP \ +@@ -24711,6 +24729,9 @@ + ;; + esac + ++printf "%s" "$lt_prog_compiler_wl" > /dev/null ++printf "%s" "$lt_prog_compiler_no_builtin_flag" > /dev/null ++ + ac_aux_dir='$ac_aux_dir' + xsi_shell='$xsi_shell' + lt_shell_append='$lt_shell_append' |