Wed Sep 7 23:43:40 2011 UTC ()
Request C++-11 mode for Clang too.


(joerg)
diff -r1.12 -r1.13 pkgsrc/devel/boost-jam/bjam.mk
cvs diff -r1.12 -r1.13 pkgsrc/devel/boost-jam/bjam.mk (expand / switch to unified diff)

--- pkgsrc/devel/boost-jam/bjam.mk 2011/03/31 06:17:12 1.12
+++ pkgsrc/devel/boost-jam/bjam.mk 2011/09/07 23:43:40 1.13
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: bjam.mk,v 1.12 2011/03/31 06:17:12 adam Exp $ 1# $NetBSD: bjam.mk,v 1.13 2011/09/07 23:43:40 joerg Exp $
2 2
3.include "../../devel/boost-jam/buildlink3.mk" 3.include "../../devel/boost-jam/buildlink3.mk"
4 4
5.include "../../devel/boost-build/toolset.mk" 5.include "../../devel/boost-build/toolset.mk"
6.include "../../mk/bsd.prefs.mk" 6.include "../../mk/bsd.prefs.mk"
7 7
8BJAM= ${BUILDLINK_PREFIX.boost-jam}/bin/bjam 8BJAM= ${BUILDLINK_PREFIX.boost-jam}/bin/bjam
9 9
10.if !empty(MAKE_JOBS) 10.if !empty(MAKE_JOBS)
11BJAM_ARGS+= -j${MAKE_JOBS} 11BJAM_ARGS+= -j${MAKE_JOBS}
12.endif 12.endif
13BJAM_ARGS+= --builddir=${WRKSRC}/build 13BJAM_ARGS+= --builddir=${WRKSRC}/build
14BJAM_ARGS+= --layout=system 14BJAM_ARGS+= --layout=system
15BJAM_ARGS+= --toolset=${BOOST_TOOLSET} 15BJAM_ARGS+= --toolset=${BOOST_TOOLSET}
16BJAM_ARGS+= --disable-long-double 16BJAM_ARGS+= --disable-long-double
17BJAM_ARGS+= ${BJAM_BUILD} 17BJAM_ARGS+= ${BJAM_BUILD}
18# GCC 4.4 and above needs this 18# GCC 4.4 and above needs this
19.include "../../mk/compiler.mk" 19.include "../../mk/compiler.mk"
20.if !empty(PKGSRC_COMPILER:Mgcc) && !empty(CC_VERSION:Mgcc-4.[4-9]*) 20.if (!empty(PKGSRC_COMPILER:Mgcc) && !empty(CC_VERSION:Mgcc-4.[4-9]*)) || !empty(PKGSRC_COMPILER:Mclang)
21BJAM_ARGS+= cxxflags=-std=c++0x 21BJAM_ARGS+= cxxflags=-std=c++0x
22.endif 22.endif
23 23
24BJAM_BUILD+= release 24BJAM_BUILD+= release
25BJAM_BUILD+= threading=multi 25BJAM_BUILD+= threading=multi
26BJAM_BUILD+= link=shared,static 26BJAM_BUILD+= link=shared,static
27 27
28BJAM_CMD= ${SETENV} ${MAKE_ENV} ${BJAM} ${BJAM_ARGS} 28BJAM_CMD= ${SETENV} ${MAKE_ENV} ${BJAM} ${BJAM_ARGS}
29 29
30.include "../../meta-pkgs/boost/options.mk" 30.include "../../meta-pkgs/boost/options.mk"
31 31
32UNLIMIT_RESOURCES+= datasize 32UNLIMIT_RESOURCES+= datasize
33 33