diff options
| author | gdt <gdt> | 2008-12-15 15:26:47 +0000 |
|---|---|---|
| committer | gdt <gdt> | 2008-12-15 15:26:47 +0000 |
| commit | e11d0f93f24b37c7fefa7a4fbb03be8f1aca1a68 (patch) | |
| tree | 62adcc2e9bf80d66fc7ad299da85a0ceb50b5f68 /lang/guile | |
| parent | 210bf11dd167ff62b33dd0d0d15e85bcd13f464e (diff) | |
| download | pkgsrc-e11d0f93f24b37c7fefa7a4fbb03be8f1aca1a68.tar.gz | |
Restore a fixed version of patch-ah. While -R was in the string, it
was there because guile was built against gmp etc. from /usr/pkg, not
present to let programs find -lguile. Therefore, add in rpath for
$(libdir) when we add in -L for libdir.
This looks ok to me, but I will be away AFK most of the day, so feel
free to remove the line in distinfo and re-commit if this turns out to
be bad.
Diffstat (limited to 'lang/guile')
| -rw-r--r-- | lang/guile/Makefile | 4 | ||||
| -rw-r--r-- | lang/guile/distinfo | 3 | ||||
| -rw-r--r-- | lang/guile/patches/patch-ah | 14 |
3 files changed, 18 insertions, 3 deletions
diff --git a/lang/guile/Makefile b/lang/guile/Makefile index acd8e5bb54f..45217d801e5 100644 --- a/lang/guile/Makefile +++ b/lang/guile/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.88 2008/12/15 15:02:13 gdt Exp $ +# $NetBSD: Makefile,v 1.89 2008/12/15 15:26:47 gdt Exp $ DISTNAME= guile-1.8.6 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=guile/} diff --git a/lang/guile/distinfo b/lang/guile/distinfo index 539c2cf349b..c6b78463d10 100644 --- a/lang/guile/distinfo +++ b/lang/guile/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.39 2008/12/15 15:02:13 gdt Exp $ +$NetBSD: distinfo,v 1.40 2008/12/15 15:26:47 gdt Exp $ SHA1 (guile-1.8.6.tar.gz) = a3896f86044a2b3740dac43e045c349d656fba31 RMD160 (guile-1.8.6.tar.gz) = d6695d266a6091dc5fb1c688e3f0286f1c6d382e Size (guile-1.8.6.tar.gz) = 3960608 bytes SHA1 (patch-ae) = c3e5065408082978df5b6ddd62e47dda8ab41f40 SHA1 (patch-ag) = 8aeb781ba43597f37b1ce4aaa2fb0baba2e4ce9c +SHA1 (patch-ah) = 351136075aaaab96117fecc7cedc8ee989d8a1e0 SHA1 (patch-ak) = 6639ea95471a76893b0b074dcbfbd139a1571309 SHA1 (patch-al) = 6a5fb3136028bb5a5185ce7174a20d5f9d227e18 diff --git a/lang/guile/patches/patch-ah b/lang/guile/patches/patch-ah new file mode 100644 index 00000000000..67a08e64b72 --- /dev/null +++ b/lang/guile/patches/patch-ah @@ -0,0 +1,14 @@ +$NetBSD: patch-ah,v 1.6 2008/12/15 15:26:47 gdt Exp $ + +--- guile-config/guile-config.in.orig 2008-12-04 13:30:41.000000000 -0500 ++++ guile-config/guile-config.in +@@ -154,7 +154,8 @@ + (if (or (string=? libdir "/usr/lib") + (string=? libdir "/usr/lib/")) + "" +- (string-append "-L" (get-build-info 'libdir))) ++ (string-append "-L" (get-build-info 'libdir) ++ " -Wl,-R" (get-build-info 'libdir))) + "-lguile -lltdl" + (string-join other-flags) + |