diff options
| author | tv <tv@pkgsrc.org> | 2005-09-21 20:31:21 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2005-09-21 20:31:21 +0000 |
| commit | 221c7d561f7f88c6ab528118b6f0fecf75d1fc9b (patch) | |
| tree | 960016c4345a8ce28788fbd814bf3cbdbfc28255 /devel | |
| parent | 0d9f1f5e825a7a292e551490f038ed4b3997fe8d (diff) | |
| download | pkgsrc-221c7d561f7f88c6ab528118b6f0fecf75d1fc9b.tar.gz | |
Add change from MirOS that resets $versuffix2 to empty if -avoid-version is used;
makes -avoid-version work properly on platforms using $versuffix2 (e.g., OpenBSD,
FreeBSD, DragonFly). Bump PKGREVISION (and will bump LIBTOOL_REQD shortly).
MirOS change by Benny Siegert <bsiegert@mirbsd.org>.
Noted in private mail by Thorsten Glaser <tg@66h.42h.de>.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/libtool-base/Makefile | 4 | ||||
| -rw-r--r-- | devel/libtool/distinfo | 4 | ||||
| -rw-r--r-- | devel/libtool/patches/patch-ac | 22 |
3 files changed, 23 insertions, 7 deletions
diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile index 220b047d485..0ccfa418e68 100644 --- a/devel/libtool-base/Makefile +++ b/devel/libtool-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.71 2005/07/13 15:58:44 tv Exp $ +# $NetBSD: Makefile,v 1.72 2005/09/21 20:31:21 tv Exp $ ########################################################################### ########################################################################### @@ -26,7 +26,7 @@ .include "../../devel/libtool/Makefile.common" PKGNAME= ${DISTNAME:S/-/-base-/} -PKGREVISION= 4 +PKGREVISION= 5 SVR4_PKGNAME= ltoob COMMENT= Generic shared library support script (the script itself) diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo index b086aabeb05..47b0a23a503 100644 --- a/devel/libtool/distinfo +++ b/devel/libtool/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.62 2005/07/03 19:42:14 tv Exp $ +$NetBSD: distinfo,v 1.63 2005/09/21 20:31:21 tv Exp $ SHA1 (libtool-1.5.18.tar.gz) = 9eae4a25cf386f2dd3937f215368c9cc090009df RMD160 (libtool-1.5.18.tar.gz) = facff15723bb89b0e260def31354fe437430bf3b Size (libtool-1.5.18.tar.gz) = 2780846 bytes SHA1 (patch-aa) = 36f589c09c492bc688bdfbb97f0d375cd04c008d SHA1 (patch-ab) = 60ab5ae3874fe13abfd089b0cf544f57517acc2b -SHA1 (patch-ac) = e7a067d002f7948361e2e90862cb96c6bba1959d +SHA1 (patch-ac) = 61a5c1ace76beeeb64388726e6a0772e8f1828e0 SHA1 (patch-ad) = 5cb326bd404762d15b053a99ea8cf041b087dc94 diff --git a/devel/libtool/patches/patch-ac b/devel/libtool/patches/patch-ac index 66a36d4ddac..88d1435474f 100644 --- a/devel/libtool/patches/patch-ac +++ b/devel/libtool/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.19 2005/06/05 18:04:37 tv Exp $ +$NetBSD: patch-ac,v 1.20 2005/09/21 20:31:21 tv Exp $ --- ltmain.sh.orig 2005-05-16 05:39:29.000000000 -0400 +++ ltmain.sh @@ -129,7 +129,15 @@ $NetBSD: patch-ac,v 1.19 2005/06/05 18:04:37 tv Exp $ continue ;; -l*) -@@ -3202,6 +3285,7 @@ EOF +@@ -3153,6 +3236,7 @@ EOF + # Calculate the version variables. + major= + versuffix= ++ versuffix2= + verstring= + case $version_type in + none) ;; +@@ -3202,6 +3286,7 @@ EOF linux) major=.`expr $current - $age` versuffix="$major.$age.$revision" @@ -137,7 +145,15 @@ $NetBSD: patch-ac,v 1.19 2005/06/05 18:04:37 tv Exp $ ;; osf) -@@ -5462,8 +5546,16 @@ relink_command=\"$relink_command\"" +@@ -3264,6 +3349,7 @@ EOF + if test "$avoid_version" = yes && test "$need_version" = no; then + major= + versuffix= ++ versuffix2= + verstring="" + fi + +@@ -5462,8 +5548,16 @@ relink_command=\"$relink_command\"" exit $EXIT_FAILURE fi |