Fixed detection of threads on NetBSD

4 files changed, 36 insertions, 8 deletions

diff --git a/meta-pkgs/boost/Makefile.common b/meta-pkgs/boost/Makefile.common
index de94f8a8b1e..e31cbe00369 100644
--- a/meta-pkgs/boost/Makefile.common
+++ b/meta-pkgs/boost/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2009/03/25 22:37:13 he Exp $
+# $NetBSD: Makefile.common,v 1.18 2009/08/21 14:54:30 adam Exp $
 #
 
 BOOST_PACKAGE?=		undefined
@@ -10,7 +10,7 @@ BOOST_SHORT_VERSION=	${BOOST_VERSION:S/./_/:C/\..*$//}
 DISTNAME=		boost_${BOOST_VERSION:S/./_/g}
 CATEGORIES=		devel
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 .if ${BOOST_PACKAGE} == "meta-pkg"
 
@@ -36,11 +36,11 @@ USE_TOOLS+=		pax
 USE_LANGUAGES=		c c++
 GCC_REQD+=		3.2 # if using gcc; ignored otherwise
 
-SUBST_CLASSES+=                 fix-prefix
-SUBST_STAGE.fix-prefix=         pre-configure
-SUBST_MESSAGE.fix-prefix=       Fixing prefix.
-SUBST_FILES.fix-prefix=         Jamroot
-SUBST_VARS.fix-prefix=          PREFIX
+SUBST_CLASSES+=			fix-prefix
+SUBST_STAGE.fix-prefix=		pre-configure
+SUBST_MESSAGE.fix-prefix=	Fixing prefix.
+SUBST_FILES.fix-prefix=		Jamroot
+SUBST_VARS.fix-prefix=		PREFIX
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo
index 189921bb1d5..d9c9c6f1207 100644
--- a/meta-pkgs/boost/distinfo
+++ b/meta-pkgs/boost/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.18 2009/03/13 07:48:57 hasso Exp $
+$NetBSD: distinfo,v 1.19 2009/08/21 14:54:30 adam Exp $
 
 SHA1 (boost_1_38_0.tar.bz2) = b32ff8133b0a38a74553c0d33cb1d70b3ce2d8f1
 RMD160 (boost_1_38_0.tar.bz2) = 1d7eb126151e4363ecd5617082cd45674f1352be
 Size (boost_1_38_0.tar.bz2) = 29164877 bytes
 SHA1 (patch-aa) = 692a9ab89c72ef8ce87dedbe16632c12c6e1f032
+SHA1 (patch-ab) = 2fa89ce671e5fb0dca160a820524cff2d1ec8927
+SHA1 (patch-ac) = bfd4ccd3c745787b24779480a5aac38e122a0647
 SHA1 (patch-af) = ef9a9363420f519c45baaf98badff4c885a7595c
 SHA1 (patch-aq) = ac325bfa0def93fac36aa1b72b269306fe0a262e
diff --git a/meta-pkgs/boost/patches/patch-ab b/meta-pkgs/boost/patches/patch-ab
new file mode 100644
index 00000000000..38323523525
--- /dev/null
+++ b/meta-pkgs/boost/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2009/08/21 14:54:30 adam Exp $
+
+--- boost/config/platform/bsd.hpp.orig	2009-08-20 17:55:59.000000000 +0200
++++ boost/config/platform/bsd.hpp
+@@ -37,7 +37,7 @@
+ // and not in <unistd.h>
+ //
+ #if (defined(__FreeBSD__) && (__FreeBSD__ <= 3))\
+-   || defined(__OpenBSD__) || defined(__DragonFly__) 
++   || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
+ #  define BOOST_HAS_PTHREADS
+ #endif
+ 
diff --git a/meta-pkgs/boost/patches/patch-ac b/meta-pkgs/boost/patches/patch-ac
new file mode 100644
index 00000000000..cd2ac96cc73
--- /dev/null
+++ b/meta-pkgs/boost/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.4 2009/08/21 14:54:30 adam Exp $
+
+--- boost/config/suffix.hpp.orig	2009-08-20 19:36:39.000000000 +0200
++++ boost/config/suffix.hpp
+@@ -224,7 +224,7 @@
+ //
+ #if (defined(__MT__) || defined(_MT) || defined(_REENTRANT) \
+     || defined(_PTHREADS) || defined(__APPLE__) || defined(__DragonFly__)) \
+-    && !defined(BOOST_HAS_THREADS)
++    || defined(__NetBSD__) && !defined(BOOST_HAS_THREADS)
+ #  define BOOST_HAS_THREADS
+ #endif
+