summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorkefren <kefren@pkgsrc.org>2011-03-17 14:24:52 +0000
committerkefren <kefren@pkgsrc.org>2011-03-17 14:24:52 +0000
commitf8cf9584a3e5f3ad43f9eb10b98bd23f5d5643d0 (patch)
tree66a9e64706ea11d99933e704d1efa17e75b9c41d /lang
parentce45ff0218b81ea512a2145ee3938a742a18d5ad (diff)
downloadpkgsrc-f8cf9584a3e5f3ad43f9eb10b98bd23f5d5643d0.tar.gz
Don't force using pthread TLS in NetBSD but check first if compiler
support (__thread) exists. Should fix PR/44725
Diffstat (limited to 'lang')
-rw-r--r--lang/mono/distinfo4
-rw-r--r--lang/mono/patches/patch-ak19
2 files changed, 17 insertions, 6 deletions
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index e6dd6774941..597389c1d65 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.75 2011/01/08 18:06:00 kefren Exp $
+$NetBSD: distinfo,v 1.76 2011/03/17 14:24:52 kefren Exp $
SHA1 (mono-2.8.2.tar.bz2) = 4223a40706b422c44be5eb1c89b4f316026a02a5
RMD160 (mono-2.8.2.tar.bz2) = 8536c1c9a481ece2ba254a7c943353f9ade66a84
@@ -13,7 +13,7 @@ SHA1 (patch-ag) = 425f470151cc8a60d1ac301b9fd1cc2abb399ea3
SHA1 (patch-ah) = 5f90aa60504b9508d21e05b390626788d71d47b4
SHA1 (patch-ai) = cd5593a7e95039980b839bdabdf59d9e68fb9f56
SHA1 (patch-aj) = a5aab739e01fd969edb85b5b3e08c087554d0a72
-SHA1 (patch-ak) = 034d260926fb31aa6b94faf5942f6ec7c7b461df
+SHA1 (patch-ak) = 838b72fdc4e2ce8a62a56f8faf98c1f334abad14
SHA1 (patch-al) = 2603dee45ca6e91df1a321015428677875a29b03
SHA1 (patch-ap) = 9da5c76e34f1f61da411ab4e0c884c23cc320bb9
SHA1 (patch-aq) = a356e520eeb95a8c3bb1485cb460710703882e39
diff --git a/lang/mono/patches/patch-ak b/lang/mono/patches/patch-ak
index 29ac59e41ff..3c9992aaca4 100644
--- a/lang/mono/patches/patch-ak
+++ b/lang/mono/patches/patch-ak
@@ -1,7 +1,18 @@
-$NetBSD: patch-ak,v 1.8 2008/02/13 14:16:43 kefren Exp $
---- libgc/pthread_support.c.orig 2007-11-09 00:07:02.000000000 +0200
-+++ libgc/pthread_support.c 2008-02-05 14:01:40.000000000 +0200
-@@ -1160,6 +1160,22 @@ void GC_end_blocking(void) {
+$NetBSD: patch-ak,v 1.9 2011/03/17 14:24:52 kefren Exp $
+--- libgc/pthread_support.c.orig 2011-01-04 19:39:55.000000000 +0200
++++ libgc/pthread_support.c 2011-03-17 16:14:10.000000000 +0200
+@@ -68,8 +68,8 @@
+
+ # if (defined(GC_DGUX386_THREADS) || defined(GC_OSF1_THREADS) || \
+ defined(GC_DARWIN_THREADS) || defined(GC_AIX_THREADS)) || \
+- defined(GC_NETBSD_THREADS) && !defined(USE_PTHREAD_SPECIFIC) || \
+- defined(GC_OPENBSD_THREADS)
++ defined(GC_NETBSD_THREADS) && !defined(USE_PTHREAD_SPECIFIC) && \
++ !defined(USE_COMPILER_TLS) || defined(GC_OPENBSD_THREADS)
+ # define USE_PTHREAD_SPECIFIC
+ # endif
+
+@@ -1175,6 +1175,22 @@
#define __d10_sleep sleep
#endif /* GC_DGUX386_THREADS */