summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoruebayasi <uebayasi@pkgsrc.org>2003-06-05 05:03:58 +0000
committeruebayasi <uebayasi@pkgsrc.org>2003-06-05 05:03:58 +0000
commit2d06759ab3c248f226265ae9919a4f20e2429c3c (patch)
tree9b2c49aff7a1122f3322bd980a8ea6c286d0911a
parent8997a308894b3e295d0f615d4e5b730c2a3f5dcc (diff)
downloadpkgsrc-2d06759ab3c248f226265ae9919a4f20e2429c3c.tar.gz
Make this threaded; link libpthread.so in advance and use threaded versions
of libc functions. Otherwise, it dies when libpthread.so is dynamically loaded by dl_open(3). Supposed to fix PR21522, Gnucash dies on startup. Bump revision to 2.
-rw-r--r--lang/guile14/Makefile9
-rw-r--r--lang/guile14/buildlink2.mk4
2 files changed, 9 insertions, 4 deletions
diff --git a/lang/guile14/Makefile b/lang/guile14/Makefile
index 499d1f75926..89e2a4848e9 100644
--- a/lang/guile14/Makefile
+++ b/lang/guile14/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/06/02 01:19:02 jschauma Exp $
+# $NetBSD: Makefile,v 1.8 2003/06/05 05:03:58 uebayasi Exp $
DISTNAME= guile-1.4.1
PKGNAME= guile14-1.4.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GNU:=guile/}
@@ -24,9 +24,14 @@ USE_GNU_READLINE= YES
INFO_FILES= guile.info
+# Link the native thread so that Guile processes won't die when libpthread.so
+# is dl_open(3)'ed.
+CFLAGS+= ${PTHREAD_CFLAGS}
+
.include "../../devel/libtool/buildlink2.mk"
.include "../../devel/ncurses/buildlink2.mk"
.include "../../devel/readline/buildlink2.mk"
+.include "../../mk/pthread.buildlink2.mk"
.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/guile14/buildlink2.mk b/lang/guile14/buildlink2.mk
index ba410b960ce..03de911a5ae 100644
--- a/lang/guile14/buildlink2.mk
+++ b/lang/guile14/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.8 2003/01/24 04:22:16 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2003/06/05 05:03:58 uebayasi Exp $
.if !defined(GUILE14_BUILDLINK2_MK)
GUILE14_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= guile14
-BUILDLINK_DEPENDS.guile14?= guile14>=1.4nb2
+BUILDLINK_DEPENDS.guile14?= guile14>=1.4nb3
BUILDLINK_PKGSRCDIR.guile14?= ../../lang/guile14
EVAL_PREFIX+= GUILE14_PREFIX=guile14