pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update devel/boost to 1.31.0. The most notable change...
details: https://anonhg.NetBSD.org/pkgsrc/rev/c6fe54d7ccdc
branches: trunk
changeset: 476335:c6fe54d7ccdc
user: tv <tv%pkgsrc.org@localhost>
date: Sun Jun 06 23:51:36 2004 +0000
description:
Update devel/boost to 1.31.0. The most notable change here is a more robust
build system, which is actually being used now to build the backing binary
libraries necessary to make date_time, regex, and a few other libraries
work.
While here, the thread and python libraries have been split out to their
own subpackages, devel/boost-thread and devel/boost-python, so that the
main boost package need not rely on the presence of either to provide
basic functionality.
diffstat:
devel/Makefile | 4 +-
devel/boost-python/DESCR | 2 +
devel/boost-python/Makefile | 39 +
devel/boost-python/PLIST | 1 +
devel/boost-python/buildlink3.mk | 23 +
devel/boost-thread/DESCR | 3 +
devel/boost-thread/Makefile | 28 +
devel/boost-thread/PLIST | 2 +
devel/boost-thread/buildlink3.mk | 21 +
devel/boost/Makefile | 63 +-
devel/boost/Makefile.common | 53 +
devel/boost/PLIST | 6107 ++++++++++++++++++-------------------
devel/boost/buildlink3.mk | 7 +-
devel/boost/distinfo | 8 +-
devel/boost/files/Makefile | 14 -
devel/boost/patches/patch-aa | 26 +
devel/boost/patches/patch-ab | 13 +
devel/boost/toolset.mk | 14 +
doc/CHANGES | 6 +-
19 files changed, 3173 insertions(+), 3261 deletions(-)
diffs (truncated from 7376 to 300 lines):
diff -r 07a0d202e2b7 -r c6fe54d7ccdc devel/Makefile
--- a/devel/Makefile Sun Jun 06 23:44:24 2004 +0000
+++ b/devel/Makefile Sun Jun 06 23:51:36 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.504 2004/06/06 21:44:51 salo Exp $
+# $NetBSD: Makefile,v 1.505 2004/06/06 23:51:36 tv Exp $
#
COMMENT= Development utilities
@@ -46,6 +46,8 @@
SUBDIR+= bonobo
SUBDIR+= bonobo-conf
SUBDIR+= boost
+SUBDIR+= boost-python
+SUBDIR+= boost-thread
SUBDIR+= buddy
SUBDIR+= buildtool
SUBDIR+= buildtool-doc
diff -r 07a0d202e2b7 -r c6fe54d7ccdc devel/boost-python/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/boost-python/DESCR Sun Jun 06 23:51:36 2004 +0000
@@ -0,0 +1,2 @@
+This package adds static and shared libraries providing support for the
+"python" Boost library.
diff -r 07a0d202e2b7 -r c6fe54d7ccdc devel/boost-python/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/boost-python/Makefile Sun Jun 06 23:51:36 2004 +0000
@@ -0,0 +1,39 @@
+# $NetBSD: Makefile,v 1.1 2004/06/06 23:51:37 tv Exp $
+#
+
+BOOST_PKGNAME_ADD= -python
+BJAM_ARGS+= --without-date_time
+BJAM_ARGS+= --without-filesystem
+BJAM_ARGS+= --without-regex
+BJAM_ARGS+= --without-signals
+BJAM_ARGS+= --without-test
+BJAM_ARGS+= --without-thread
+BJAM_ARGS+= -sPYTHON_ROOT=${PREFIX}
+BJAM_ARGS+= -sPYTHON_VERSION=${PYVERSSUFFIX}
+
+# this pkg doesn't support threaded python yet:
+BJAM_BUILD+= <threading>single
+PYTHON_VERSIONS_INCOMPATIBLE+= 23pth 22pth 21 21pth 20 15
+
+COMMENT= Python support for Boost C++ libraries
+
+.include "../boost/Makefile.common"
+
+do-configure:
+ ${CP} -f ${LOCALBASE}/include/boost-1_31/boost/config/user.hpp \
+ ${WRKSRC}/boost/config/user.hpp
+
+do-build:
+ @cd ${WRKSRC} && ${BJAM_CMD} stage
+
+do-install:
+ ${INSTALL_DATA} ${WRKSRC}/boost/config/user.hpp \
+ ${PREFIX}/include/boost-1_31/boost/config/thread_user.hpp
+ ${INSTALL_LIB} ${WRKSRC}/stage/lib/*-1_31.* ${PREFIX}/lib/
+ @cd ${WRKSRC}/stage/lib && for f in *-1_31.*; do \
+ ${LN} -f ${PREFIX}/lib/$$f \
+ ${PREFIX}/lib/`${ECHO} $$f | ${SED} s,-1_31,,`; \
+ done
+
+.include "../../lang/python/application.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r 07a0d202e2b7 -r c6fe54d7ccdc devel/boost-python/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/boost-python/PLIST Sun Jun 06 23:51:36 2004 +0000
@@ -0,0 +1,1 @@
+@comment $NetBSD: PLIST,v 1.1 2004/06/06 23:51:37 tv Exp $
diff -r 07a0d202e2b7 -r c6fe54d7ccdc devel/boost-python/buildlink3.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/boost-python/buildlink3.mk Sun Jun 06 23:51:36 2004 +0000
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/06/06 23:51:37 tv Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BOOST_PYTHON_BUILDLINK3_MK:= ${BOOST_PYTHON_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= boost-python
+.endif
+
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nboost-python}
+BUILDLINK_PACKAGES+= boost-python
+
+.if !empty(BOOST_PYTHON_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.boost-python+= boost-python-1.31.*
+BUILDLINK_PKGSRCDIR.boost-python?= ../../devel/boost-python
+
+# the following should match the list in Makefile
+PYTHON_VERSIONS_INCOMPATIBLE+= 23pth 22pth 21 21pth 20 15
+.endif # BOOST_PYTHON_BUILDLINK3_MK
+
+.include "../../devel/boost/buildlink3.mk"
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 07a0d202e2b7 -r c6fe54d7ccdc devel/boost-thread/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/boost-thread/DESCR Sun Jun 06 23:51:36 2004 +0000
@@ -0,0 +1,3 @@
+This package adds static and shared libraries providing support for the
+"thread" Boost library, as well as multithreading-aware versions of the
+other Boost libraries.
diff -r 07a0d202e2b7 -r c6fe54d7ccdc devel/boost-thread/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/boost-thread/Makefile Sun Jun 06 23:51:36 2004 +0000
@@ -0,0 +1,28 @@
+# $NetBSD: Makefile,v 1.1 2004/06/06 23:51:37 tv Exp $
+#
+
+BOOST_PKGNAME_ADD= -thread
+BJAM_ARGS+= --without-python
+BJAM_BUILD+= <threading>multi
+
+COMMENT= Threading support for Boost C++ libraries
+
+.include "../boost/Makefile.common"
+
+do-configure: userhpp-configure
+ ${LN} -s -f user.hpp ${WRKSRC}/boost/config/thread_user.hpp
+
+do-build:
+ @cd ${WRKSRC} && ${BJAM_CMD} stage
+
+do-install:
+ ${INSTALL_DATA} ${WRKSRC}/boost/config/user.hpp \
+ ${PREFIX}/include/boost-1_31/boost/config/thread_user.hpp
+ ${INSTALL_LIB} ${WRKSRC}/stage/lib/*-1_31.* ${PREFIX}/lib/
+ @cd ${WRKSRC}/stage/lib && for f in *-1_31.*; do \
+ ${LN} -f ${PREFIX}/lib/$$f \
+ ${PREFIX}/lib/`${ECHO} $$f | ${SED} s,-1_31,,`; \
+ done
+
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r 07a0d202e2b7 -r c6fe54d7ccdc devel/boost-thread/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/boost-thread/PLIST Sun Jun 06 23:51:36 2004 +0000
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2004/06/06 23:51:37 tv Exp $
+include/boost-1_31/boost/config/thread_user.hpp
diff -r 07a0d202e2b7 -r c6fe54d7ccdc devel/boost-thread/buildlink3.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/boost-thread/buildlink3.mk Sun Jun 06 23:51:36 2004 +0000
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/06/06 23:51:37 tv Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BOOST_THREAD_BUILDLINK3_MK:= ${BOOST_THREAD_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= boost-thread
+.endif
+
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nboost-thread}
+BUILDLINK_PACKAGES+= boost-thread
+
+.if !empty(BOOST_THREAD_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.boost-thread+= boost-thread>=1.31.0
+BUILDLINK_PKGSRCDIR.boost-thread?= ../../devel/boost-thread
+.endif # BOOST_THREAD_BUILDLINK3_MK
+
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../devel/boost/buildlink3.mk"
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 07a0d202e2b7 -r c6fe54d7ccdc devel/boost/Makefile
--- a/devel/boost/Makefile Sun Jun 06 23:44:24 2004 +0000
+++ b/devel/boost/Makefile Sun Jun 06 23:51:36 2004 +0000
@@ -1,49 +1,38 @@
-# $NetBSD: Makefile,v 1.19 2004/06/04 15:07:17 tv Exp $
+# $NetBSD: Makefile,v 1.20 2004/06/06 23:51:36 tv Exp $
#
-DISTNAME= boost-1.30.2
-PKGREVISION= 1
-CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=boost/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= tech-pkg%NetBSD.org@localhost
-HOMEPAGE= http://www.boost.org/
COMMENT= Free, portable libraries that integrate with the ISO C++ Stdlib
-# Need working <limits> and <memory> not present in older gcc.
-# Other compilers are left alone to use their own STL.
-GCC_REQD+= 3.0
-
-USE_LANGUAGES+= c++
-USE_LIBTOOL= # defined
-BOOST_VERS= 0:0
-MAKE_ENV+= BOOST_VERS="${BOOST_VERS}"
-
-LIBDIR= ${PREFIX}/lib
-INCDIR= ${PREFIX}/include/boost
+BJAM= ${WRKSRC}/tools/build/jam_src/bin.*/bjam
+BJAM_ARGS+= --without-python
+BJAM_ARGS+= --without-thread
+BJAM_BUILD+= <threading>single
HTMLDIR= ${PREFIX}/share/doc/html/boost
-do-configure:
- ${CP} ${FILESDIR}/Makefile ${WRKSRC}
+.include "../boost/Makefile.common"
+
+do-configure: userhpp-configure
-post-build:
- ${FIND} ${WRKSRC}/libs \
- \( -name "*.zip" -or -name "*.tgz" \
- -or -name "*.orig" -or -name "*.bak" \
- -or -name "c++boost.gif" \) \
- -exec ${RM} -f {} \;
+do-build:
+ @cd ${WRKSRC}/tools/build/jam_src && ${SETENV} ${MAKE_ENV} ${SH} ./build.sh
+ @cd ${WRKSRC} && ${BJAM_CMD} stage
do-install:
- cd ${WRKSRC}; ${LIBTOOL} ${INSTALL_DATA} libboost.la ${LIBDIR}
- ${CP} -R ${WRKSRC}/boost ${PREFIX}/include
+ @cd ${WRKSRC} && ${BJAM_CMD} install
+ ${FIND} ${WRKSRC}/libs \
+ \( -name "*.zip" -or -name "*.tgz" \
+ -or -name "*.orig" -or -name "*.bak" \) \
+ -exec ${RM} -f {} \;
+ ${INSTALL_PROGRAM} ${BJAM} ${PREFIX}/bin/bjam
${INSTALL_DATA_DIR} ${HTMLDIR}
- ${INSTALL_DATA} \
- ${WRKSRC}/c++boost.gif \
- ${WRKSRC}/index.htm \
- ${HTMLDIR}
- ${CP} -R ${WRKSRC}/libs ${WRKSRC}/more ${HTMLDIR}
- ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INCDIR} ${HTMLDIR}
- ${CHMOD} -R a+r-w ${INCDIR} ${HTMLDIR}
+ cd ${WRKSRC} && ${PAX} -rw -pm \
+ -s':^.*/build$$::' \
+ -s':^.*/build/.*$$::' \
+ -s':^libs/.*/test$$::' \
+ -s':^libs/.*/test/.*$$::' \
+ *.gif *.css *.htm libs more ${HTMLDIR}
+ ${FIND} ${HTMLDIR} -type f -print | ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP}
+ ${FIND} ${HTMLDIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
+ ${FIND} ${PREFIX}/include/boost-1_31 -type f -print | ${XARGS} ${TOUCH}
.include "../../mk/bsd.pkg.mk"
diff -r 07a0d202e2b7 -r c6fe54d7ccdc devel/boost/Makefile.common
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/boost/Makefile.common Sun Jun 06 23:51:36 2004 +0000
@@ -0,0 +1,53 @@
+# $NetBSD: Makefile.common,v 1.1 2004/06/06 23:51:36 tv Exp $
+#
+
+BOOST_VERSION= 1.31.0
+
+DISTNAME= boost_${BOOST_VERSION:S/./_/g}
+PKGNAME= boost${BOOST_PKGNAME_ADD}-${BOOST_VERSION}
+CATEGORIES= devel
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=boost/}
+EXTRACT_SUFX= .tar.bz2
+
+MAINTAINER= tech-pkg%NetBSD.org@localhost
+HOMEPAGE= http://www.boost.org/
+
+DISTINFO_FILE= ${.CURDIR}/../boost/distinfo
+PATCHDIR= ${.CURDIR}/../boost/patches
+PLIST_SRC= ${WRKSRC}/PLIST.libs ${.CURDIR}/PLIST
+
+USE_BUILDLINK3= yes
+USE_LANGUAGES+= c++
+GCC_REQD+= 3.2 # if using gcc; ignored otherwise
+
+BJAM?= ${LOCALBASE}/bin/bjam
+BJAM_ARGS+= --builddir=${WRKSRC}/build
+BJAM_ARGS+= --prefix=${PREFIX}
+BJAM_ARGS+= -sBUILD=${BJAM_BUILD:Q}
+BJAM_BUILD+= <linkflags>-Wl,-R${LOCALBASE}/lib
+BJAM_BUILD+= release
+BJAM_CMD= ${SETENV} ${MAKE_ENV} ${BJAM} ${BJAM_ARGS}
+
+.include "../boost/toolset.mk"
+
+BJAM_ARGS+= -sTOOLS=${BOOST_TOOLSET}
+
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(BOOST_DEBUG) && !empty(BOOST_DEBUG:M[Yy][Ee][Ss])
+BJAM_BUILD+= debug
+.endif
+
+userhpp-configure:
+ @cd ${WRKSRC}/libs/config && ${SETENV} ${CONFIGURE_ENV} ${SH} ./configure
+ ${CP} -f ${WRKSRC}/libs/config/user.hpp ${WRKSRC}/boost/config/user.hpp
+
+post-build:
+ @cd ${WRKSRC}/stage && \
+ ${LS} -1 lib/libboost_* >${WRKSRC}/PLIST.libs
+
Home |
Main Index |
Thread Index |
Old Index