pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/boost sigh, nb1 already?... Fix the interaction ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/bb2094c1e0f4
branches: trunk
changeset: 476352:bb2094c1e0f4
user: tv <tv%pkgsrc.org@localhost>
date: Mon Jun 07 04:45:11 2004 +0000
description:
sigh, nb1 already?... Fix the interaction of devel/boost and
devel/boost-thread by choosing user.hpp vs. thread_user.hpp based on
_REENTRANT or _PTHREADS being defined. (This set of conditionals will
probably need to be expanded as SunPro and MIPSpro are tested.)
diffstat:
devel/boost/Makefile.common | 7 ++++---
devel/boost/distinfo | 4 ++--
devel/boost/patches/patch-ab | 26 +++++++++++++++-----------
3 files changed, 21 insertions(+), 16 deletions(-)
diffs (70 lines):
diff -r a457bd40bdbd -r bb2094c1e0f4 devel/boost/Makefile.common
--- a/devel/boost/Makefile.common Mon Jun 07 02:59:09 2004 +0000
+++ b/devel/boost/Makefile.common Mon Jun 07 04:45:11 2004 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile.common,v 1.1 2004/06/06 23:51:36 tv Exp $
+# $NetBSD: Makefile.common,v 1.2 2004/06/07 04:45:11 tv Exp $
#
BOOST_VERSION= 1.31.0
DISTNAME= boost_${BOOST_VERSION:S/./_/g}
+PKGREVISION= 1
PKGNAME= boost${BOOST_PKGNAME_ADD}-${BOOST_VERSION}
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=boost/}
@@ -46,8 +47,8 @@
@cd ${WRKSRC}/stage && \
${LS} -1 lib/libboost_* >${WRKSRC}/PLIST.libs
-# depend on main package for subpackages
+# depend on main package for subpackages (exact version match)
.ifdef BOOST_PKGNAME_ADD
.include "../../devel/boost/buildlink3.mk"
-BUILDLINK_DEPENDS.boost= boost-${BOOST_VERSION} # exact match
+BUILDLINK_DEPENDS.boost= ${PKGNAME:S/${BOOST_PKGNAME_ADD}//}
.endif
diff -r a457bd40bdbd -r bb2094c1e0f4 devel/boost/distinfo
--- a/devel/boost/distinfo Mon Jun 07 02:59:09 2004 +0000
+++ b/devel/boost/distinfo Mon Jun 07 04:45:11 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2004/06/06 23:51:36 tv Exp $
+$NetBSD: distinfo,v 1.8 2004/06/07 04:45:11 tv Exp $
SHA1 (boost_1_31_0.tar.bz2) = 381159c432f209b3a9f25cb14140aa52d003122d
Size (boost_1_31_0.tar.bz2) = 6979482 bytes
SHA1 (patch-aa) = 3d38799ed178661b8803958cd12c2161a475ff05
-SHA1 (patch-ab) = ed598d823567aa115cab7454ce1f82b75a28fad8
+SHA1 (patch-ab) = b70c955e7719690325ab8f9fd86aeaa40d8aebc0
diff -r a457bd40bdbd -r bb2094c1e0f4 devel/boost/patches/patch-ab
--- a/devel/boost/patches/patch-ab Mon Jun 07 02:59:09 2004 +0000
+++ b/devel/boost/patches/patch-ab Mon Jun 07 04:45:11 2004 +0000
@@ -1,13 +1,17 @@
-$NetBSD: patch-ab,v 1.1 2004/06/06 23:51:37 tv Exp $
+$NetBSD: patch-ab,v 1.2 2004/06/07 04:45:11 tv Exp $
---- boost/config/requires_threads.hpp.orig Sun Jun 6 00:06:40 2004
-+++ boost/config/requires_threads.hpp
-@@ -11,6 +11,8 @@
- # include <boost/config.hpp>
+--- boost/config.hpp.orig Mon Jun 7 00:05:59 2004
++++ boost/config.hpp
+@@ -19,7 +19,11 @@
+
+ // if we don't have a user config, then use the default location:
+ #if !defined(BOOST_USER_CONFIG) && !defined(BOOST_NO_USER_CONFIG)
+-# define BOOST_USER_CONFIG <boost/config/user.hpp>
++# if defined(_REENTRANT) || defined(_PTHREADS)
++# define BOOST_USER_CONFIG <boost/config/thread_user.hpp>
++# else
++# define BOOST_USER_CONFIG <boost/config/user.hpp>
++# endif
#endif
-
-+#include <boost/config/thread_user.hpp>
-+
- #if defined(BOOST_DISABLE_THREADS)
-
- //
+ // include it first:
+ #ifdef BOOST_USER_CONFIG
Home |
Main Index |
Thread Index |
Old Index