diff options
| author | adam <adam> | 2013-11-20 19:17:55 +0000 |
|---|---|---|
| committer | adam <adam> | 2013-11-20 19:17:55 +0000 |
| commit | e48a5fef2b75a69942bed951123be2aadaf3d36e (patch) | |
| tree | 8754b3e56b779e8e4aee69604baa6075c5aa4659 /devel/boost-jam | |
| parent | 8707b7202b7f02a58932320bc5f7032ac08f327d (diff) | |
| download | pkgsrc-e48a5fef2b75a69942bed951123be2aadaf3d36e.tar.gz | |
* Fix building with GCC (PR#48388).
* Build long double math libraries on NetBSD and FreeBSD.
* Removed obsolete patches.
Diffstat (limited to 'devel/boost-jam')
| -rw-r--r-- | devel/boost-jam/bjam.mk | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/devel/boost-jam/bjam.mk b/devel/boost-jam/bjam.mk index c38c2a93329..2b502d8a45d 100644 --- a/devel/boost-jam/bjam.mk +++ b/devel/boost-jam/bjam.mk @@ -1,4 +1,4 @@ -# $NetBSD: bjam.mk,v 1.14 2013/11/12 16:49:07 adam Exp $ +# $NetBSD: bjam.mk,v 1.15 2013/11/20 19:17:55 adam Exp $ .include "../../devel/boost-jam/buildlink3.mk" @@ -15,20 +15,28 @@ BJAM_ARGS+= --layout=system BJAM_ARGS+= --toolset=${BOOST_TOOLSET} BJAM_ARGS+= --disable-long-double BJAM_ARGS+= ${BJAM_BUILD} -# GCC 4.4 and above needs this + .include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Mgcc) && !empty(CC_VERSION:Mgcc-4.[4-9]*) + +.if !empty(PKGSRC_COMPILER:Mgcc) +. if !empty(CC_VERSION:Mgcc-4.[4-7]*) BJAM_ARGS+= cxxflags=-std=c++0x +CXXFLAGS+= -std=c++0x +. elif !empty(CC_VERSION:Mgcc-4.[89]*) +BJAM_ARGS+= cxxflags=-std=c++11 +CXXFLAGS+= -std=c++11 +. endif .endif -# + .if !empty(PKGSRC_COMPILER:Mclang) BJAM_ARGS+= cxxflags=-std=c++11 +CXXFLAGS+= -std=c++11 . if !empty(OPSYS:MDarwin) BJAM_ARGS+= cxxflags=-stdlib=libc++ linkflags=-stdlib=libc++ . endif .endif -BJAM_BUILD+= release +BJAM_BUILD+= variant=release BJAM_BUILD+= threading=multi BJAM_BUILD+= link=shared,static |