Mon Dec 15 15:26:47 2008 UTC ()
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.


(gdt)
diff -r1.88 -r1.89 pkgsrc/lang/guile/Makefile
diff -r1.39 -r1.40 pkgsrc/lang/guile/distinfo
diff -r0 -r1.6 pkgsrc/lang/guile/patches/patch-ah
cvs diff -r1.88 -r1.89 pkgsrc/lang/guile/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/guile/Attic/Makefile 2008/12/15 15:02:13 1.88
+++ pkgsrc/lang/guile/Attic/Makefile 2008/12/15 15:26:47 1.89
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.88 2008/12/15 15:02:13 gdt Exp $ 1# $NetBSD: Makefile,v 1.89 2008/12/15 15:26:47 gdt Exp $
2 2
3DISTNAME= guile-1.8.6 3DISTNAME= guile-1.8.6
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= ${MASTER_SITE_GNU:=guile/} 6MASTER_SITES= ${MASTER_SITE_GNU:=guile/}
7 7
8MAINTAINER= gdt@NetBSD.org 8MAINTAINER= gdt@NetBSD.org
9HOMEPAGE= http://www.gnu.org/software/guile/guile.html 9HOMEPAGE= http://www.gnu.org/software/guile/guile.html
10COMMENT= GNU's Ubiquitous Intelligent Language for Extension 10COMMENT= GNU's Ubiquitous Intelligent Language for Extension
11 11
12CONFLICTS= guile14<1.4.1nb1 guile-oops-[0-9]* 12CONFLICTS= guile14<1.4.1nb1 guile-oops-[0-9]*
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16GNU_CONFIGURE= YES 16GNU_CONFIGURE= YES
17USE_TOOLS+= gmake makeinfo 17USE_TOOLS+= gmake makeinfo
cvs diff -r1.39 -r1.40 pkgsrc/lang/guile/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/guile/Attic/distinfo 2008/12/15 15:02:13 1.39
+++ pkgsrc/lang/guile/Attic/distinfo 2008/12/15 15:26:47 1.40
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.39 2008/12/15 15:02:13 gdt Exp $ 1$NetBSD: distinfo,v 1.40 2008/12/15 15:26:47 gdt Exp $
2 2
3SHA1 (guile-1.8.6.tar.gz) = a3896f86044a2b3740dac43e045c349d656fba31 3SHA1 (guile-1.8.6.tar.gz) = a3896f86044a2b3740dac43e045c349d656fba31
4RMD160 (guile-1.8.6.tar.gz) = d6695d266a6091dc5fb1c688e3f0286f1c6d382e 4RMD160 (guile-1.8.6.tar.gz) = d6695d266a6091dc5fb1c688e3f0286f1c6d382e
5Size (guile-1.8.6.tar.gz) = 3960608 bytes 5Size (guile-1.8.6.tar.gz) = 3960608 bytes
6SHA1 (patch-ae) = c3e5065408082978df5b6ddd62e47dda8ab41f40 6SHA1 (patch-ae) = c3e5065408082978df5b6ddd62e47dda8ab41f40
7SHA1 (patch-ag) = 8aeb781ba43597f37b1ce4aaa2fb0baba2e4ce9c 7SHA1 (patch-ag) = 8aeb781ba43597f37b1ce4aaa2fb0baba2e4ce9c
 8SHA1 (patch-ah) = 351136075aaaab96117fecc7cedc8ee989d8a1e0
8SHA1 (patch-ak) = 6639ea95471a76893b0b074dcbfbd139a1571309 9SHA1 (patch-ak) = 6639ea95471a76893b0b074dcbfbd139a1571309
9SHA1 (patch-al) = 6a5fb3136028bb5a5185ce7174a20d5f9d227e18 10SHA1 (patch-al) = 6a5fb3136028bb5a5185ce7174a20d5f9d227e18
File Added: pkgsrc/lang/guile/patches/Attic/patch-ah
$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)