summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorjtb <jtb@pkgsrc.org>2003-07-11 07:28:12 +0000
committerjtb <jtb@pkgsrc.org>2003-07-11 07:28:12 +0000
commit55135ef3b79d71394b51474997228e9cc16cd0db (patch)
treeca3180cc87a5aa6261838f5021001ff342189110 /lang
parent39cfe91bd1d79dad2553dd2848c07b6e493fc2d9 (diff)
downloadpkgsrc-55135ef3b79d71394b51474997228e9cc16cd0db.tar.gz
Following a discussion between wiz and nathanw:
Enable cilk to work with pthread libraries without the PTHREAD_SCOPE_SYSTEM attribute. This allows it to work with the native pthreads.
Diffstat (limited to 'lang')
-rw-r--r--lang/cilk/Makefile8
-rw-r--r--lang/cilk/distinfo3
-rw-r--r--lang/cilk/patches/patch-ac20
3 files changed, 25 insertions, 6 deletions
diff --git a/lang/cilk/Makefile b/lang/cilk/Makefile
index 67b6db18b4f..eaac3c0dc49 100644
--- a/lang/cilk/Makefile
+++ b/lang/cilk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/07/10 13:16:20 jtb Exp $
+# $NetBSD: Makefile,v 1.12 2003/07/11 07:28:12 jtb Exp $
DISTNAME= cilk-5.3.1
PKGREVISION= 2
@@ -17,10 +17,8 @@ USE_BUILDLINK2= # defined
USE_GMAKE= # defined
USE_PERL5= yes
USE_LIBTOOL= yes
-PTHREAD_OPTS+= require
-
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
+PTHREAD_OPTS+= require
USE_NEW_TEXINFO= YES
INFO_FILES= cilk-faq.info
@@ -37,5 +35,5 @@ post-install:
${PREFIX}/share/examples/cilk
${INSTALL_DATA} ${WRKSRC}/FAQ/cilk-faq.info ${PREFIX}/info
-.include "../../devel/pth/buildlink2.mk"
+.include "../../mk/pthread.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/cilk/distinfo b/lang/cilk/distinfo
index be8012373dc..af9ec0fee2c 100644
--- a/lang/cilk/distinfo
+++ b/lang/cilk/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2002/07/18 00:54:36 dmcmahill Exp $
+$NetBSD: distinfo,v 1.4 2003/07/11 07:28:13 jtb Exp $
SHA1 (cilk-5.3.1.tar.gz) = 2a0d142badc7be57787c4608fc07b98090207994
Size (cilk-5.3.1.tar.gz) = 848755 bytes
SHA1 (patch-aa) = de31546280810242eb44f1d06ded023d23109092
SHA1 (patch-ab) = c8bb837869e3dced44aeff03ba36879929e9251f
+SHA1 (patch-ac) = d10863c21fd5d29b512baa662f8e91caa6d17f08
diff --git a/lang/cilk/patches/patch-ac b/lang/cilk/patches/patch-ac
new file mode 100644
index 00000000000..da584eb1a95
--- /dev/null
+++ b/lang/cilk/patches/patch-ac
@@ -0,0 +1,20 @@
+$NetBSD: patch-ac,v 1.1 2003/07/11 07:28:13 jtb Exp $
+
+--- runtime/workers.c.orig
++++ runtime/workers.c
+@@ -60,8 +60,10 @@
+ CILK_CHECK(tid, (NULL, "could not malloc tid\n"));
+
+ pthread_attr_init(&attr); /* initialize attr with default attributes */
++#ifdef PTHREAD_SCOPE_SYSTEM
+ pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM);
+ /* system-wide contention */
++#endif
+
+ for (i = 0; i < USE_PARAMETER(active_size); i++)
+ {
+@@ -82,4 +84,3 @@
+ res, i));
+ }
+ }
+-