diff options
author | jperkin <jperkin> | 2013-12-11 17:01:06 +0000 |
---|---|---|
committer | jperkin <jperkin> | 2013-12-11 17:01:06 +0000 |
commit | c28d7874cffc139883e501eeba849fde9cbbc18f (patch) | |
tree | 201c08b61fb68cfe4bf373f93ea2d51364e6080c /devel | |
parent | 75c1a40619a811cf2bf4e3424d671a69612b648d (diff) | |
download | pkgsrc-c28d7874cffc139883e501eeba849fde9cbbc18f.tar.gz |
The Boost log library has aggressive compiler requirements, disable it
on Darwin with GCC as it does not have new enough STL. This will most
likely need extending to other platforms/compilers.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/boost-libs/Makefile | 11 | ||||
-rw-r--r-- | devel/boost-libs/PLIST | 8 |
2 files changed, 13 insertions, 6 deletions
diff --git a/devel/boost-libs/Makefile b/devel/boost-libs/Makefile index bab09989878..b730f7b4aac 100644 --- a/devel/boost-libs/Makefile +++ b/devel/boost-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2013/03/12 19:28:08 martin Exp $ +# $NetBSD: Makefile,v 1.26 2013/12/11 17:01:06 jperkin Exp $ BOOST_PACKAGE= libs BOOST_COMMENT= (binary libraries) @@ -10,7 +10,7 @@ BOOST_INSTALL_LIBS= yes INSTALLATION_DIRS+= lib BJAM_ARGS+= --without-python -PLIST_VARS+= context +PLIST_VARS+= context log .if !empty(OPSYS:MNetBSD) && !empty(MACHINE_ARCH:Msparc64) BJAM_ARGS+= pch=off @@ -22,6 +22,13 @@ BJAM_ARGS+= --without-context PLIST.context= yes .endif +# Darwin GCC is unable to build Boost.Log +.if ${OPSYS} == "Darwin" && !empty(PKGSRC_COMPILER:Mgcc) +BJAM_ARGS+= --without-log +.else +PLIST.log= yes +.endif + UNLIMIT_RESOURCES+= stacksize .include "../../devel/boost-jam/bjam.mk" diff --git a/devel/boost-libs/PLIST b/devel/boost-libs/PLIST index 29f7db1f3f3..07ed466783d 100644 --- a/devel/boost-libs/PLIST +++ b/devel/boost-libs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.23 2013/11/20 19:17:55 adam Exp $ +@comment $NetBSD: PLIST,v 1.24 2013/12/11 17:01:06 jperkin Exp $ lib/libboost_atomic.a lib/libboost_atomic.so lib/libboost_atomic.so.${BOOST_VERSION} @@ -27,9 +27,9 @@ lib/libboost_iostreams.so.${BOOST_VERSION} lib/libboost_locale.a lib/libboost_locale.so lib/libboost_locale.so.${BOOST_VERSION} -lib/libboost_log.a -lib/libboost_log.so -lib/libboost_log.so.${BOOST_VERSION} +${PLIST.log}lib/libboost_log.a +${PLIST.log}lib/libboost_log.so +${PLIST.log}lib/libboost_log.so.${BOOST_VERSION} lib/libboost_log_setup.a lib/libboost_log_setup.so lib/libboost_log_setup.so.${BOOST_VERSION} |