summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoruebayasi <uebayasi@pkgsrc.org>2003-01-17 04:52:30 +0000
committeruebayasi <uebayasi@pkgsrc.org>2003-01-17 04:52:30 +0000
commitb04a3ffc4764bb616b18209b36ae59d0eae27acc (patch)
treec776eb1f10183b5e7c19e38244634ea70e5fdbf1
parent175f0f7f4f7c5314e0a5f403783315f5f4f4e508 (diff)
downloadpkgsrc-b04a3ffc4764bb616b18209b36ae59d0eae27acc.tar.gz
Make 'guile-config link' report runtime path link command
(-Wl,-R${path_to_libguile}) too. This has not turned to be obvious because libguile happens to be put in a popular directory. Bump revision to 1.
-rw-r--r--lang/guile/Makefile3
-rw-r--r--lang/guile/buildlink2.mk4
-rw-r--r--lang/guile/distinfo3
-rw-r--r--lang/guile/patches/patch-ah13
4 files changed, 19 insertions, 4 deletions
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index af09126b7a2..43287f3559f 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2003/01/16 16:43:04 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2003/01/17 04:52:30 uebayasi Exp $
DISTNAME= guile-1.6.1
+PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GNU:=guile/}
diff --git a/lang/guile/buildlink2.mk b/lang/guile/buildlink2.mk
index 8ea3dfa19a0..d32b0dadc49 100644
--- a/lang/guile/buildlink2.mk
+++ b/lang/guile/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/01/16 02:48:12 uebayasi Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/01/17 04:52:30 uebayasi Exp $
.if !defined(GUILE_BUILDLINK2_MK)
GUILE_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= guile
-BUILDLINK_DEPENDS.guile?= guile>=1.6
+BUILDLINK_DEPENDS.guile?= guile>=1.6nb1
BUILDLINK_PKGSRCDIR.guile?= ../../lang/guile
EVAL_PREFIX+= BUILDLINK_PREFIX.guile=guile
diff --git a/lang/guile/distinfo b/lang/guile/distinfo
index f838c59abb3..1708c9570d8 100644
--- a/lang/guile/distinfo
+++ b/lang/guile/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.10 2003/01/06 10:38:07 uebayasi Exp $
+$NetBSD: distinfo,v 1.11 2003/01/17 04:52:30 uebayasi Exp $
SHA1 (guile-1.6.1.tar.gz) = 0e27193b79fd2ec4bc9daa71320bc5d34c62cfd0
Size (guile-1.6.1.tar.gz) = 2787537 bytes
SHA1 (patch-ad) = 180cb9e0f5dcd3e53f0b3b17d1ac0fc5016c1e36
SHA1 (patch-af) = 7d4f1934fe57efb4f8803f5e68e6a13569e836c0
SHA1 (patch-ag) = 33735111e799c529f42cfa97a71be8dfaa56aa8b
+SHA1 (patch-ah) = e66596a5ecc5c2d4fd09833507499b4d02c7af8a
diff --git a/lang/guile/patches/patch-ah b/lang/guile/patches/patch-ah
new file mode 100644
index 00000000000..91b29ec4817
--- /dev/null
+++ b/lang/guile/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2003/01/17 04:52:31 uebayasi Exp $
+
+--- guile-config/guile-config.in.orig Sun Dec 8 07:41:30 2002
++++ guile-config/guile-config.in
+@@ -177,7 +177,7 @@
+ (string=? libdir "/usr/lib/"))
+ (display-separated (cons "-lguile -lguile-ltdl" other-flags))
+ (display-separated (cons
+- (string-append "-L" (get-build-info 'libdir))
++ (string-append "-Wl,-R" (get-build-info 'libdir) " -L" (get-build-info 'libdir))
+ (cons "-lguile -lguile-ltdl" other-flags))))
+ (newline)))
+