diff options
| author | joerg <joerg@pkgsrc.org> | 2006-02-28 23:34:46 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-02-28 23:34:46 +0000 |
| commit | 8cbe3ad7dd9961398ea69505f880fae6854df3ee (patch) | |
| tree | 92095e3bb8c176500e0e254af3163ac5c0e250d4 | |
| parent | 6bd06c9cd1a1fe59f8288b845e2876bea7c32a03 (diff) | |
| download | pkgsrc-8cbe3ad7dd9961398ea69505f880fae6854df3ee.tar.gz | |
Comment out a fragment of ltmain.sh, which breaks the installation
of postgresql80-client. According to Ralf Wildenhues from libtool,
this fragment is just broken and the pre-1.5.21 was effectively a NOP.
Bump libtool-base revision.
| -rw-r--r-- | devel/libtool-base/Makefile | 4 | ||||
| -rw-r--r-- | devel/libtool/distinfo | 4 | ||||
| -rw-r--r-- | devel/libtool/patches/patch-ac | 24 |
3 files changed, 26 insertions, 6 deletions
diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile index c74ba6e3517..4b5e1e3a59f 100644 --- a/devel/libtool-base/Makefile +++ b/devel/libtool-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2006/02/06 18:57:30 tv Exp $ +# $NetBSD: Makefile,v 1.76 2006/02/28 23:34:46 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) diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo index bb876b3f237..b70fa1d0db9 100644 --- a/devel/libtool/distinfo +++ b/devel/libtool/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.66 2006/02/06 18:57:30 tv Exp $ +$NetBSD: distinfo,v 1.67 2006/02/28 23:34:46 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 (patch-aa) = 4c979de3439dfffa48295e094c1aee40c7e79fa6 SHA1 (patch-ab) = e8cf42513805e70a96536c55921c230a7e5244b1 -SHA1 (patch-ac) = 61a5c1ace76beeeb64388726e6a0772e8f1828e0 +SHA1 (patch-ac) = 88fd5714cd0a27e47d17179c894edca3c81b2ecf SHA1 (patch-ad) = 22b871497d955b2de26a632513a11f3dd16e7286 diff --git a/devel/libtool/patches/patch-ac b/devel/libtool/patches/patch-ac index 88d1435474f..e18f05b6b43 100644 --- a/devel/libtool/patches/patch-ac +++ b/devel/libtool/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.20 2005/09/21 20:31:21 tv Exp $ +$NetBSD: patch-ac,v 1.21 2006/02/28 23:34:46 joerg Exp $ --- ltmain.sh.orig 2005-05-16 05:39:29.000000000 -0400 +++ ltmain.sh @@ -153,7 +153,27 @@ $NetBSD: patch-ac,v 1.20 2005/09/21 20:31:21 tv Exp $ verstring="" fi -@@ -5462,8 +5548,16 @@ relink_command=\"$relink_command\"" +@@ -3409,12 +3495,13 @@ EOF + oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` + fi + +- # Eliminate all temporary directories. +- for path in $notinst_path; do +- lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` +- deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` +- dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` +- done ++ ### Commented out in pkgsrc, since it is completely broken. ++ ## Eliminate all temporary directories. ++ #for path in $notinst_path; do ++ # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` ++ # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` ++ # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` ++ #done + + if test -n "$xrpath"; then + # If the user specified any rpath flags, then add them. +@@ -5820,8 +5907,16 @@ relink_command=\"$relink_command\"" exit $EXIT_FAILURE fi |