diff options
| author | jdc <jdc@pkgsrc.org> | 2012-08-15 18:28:20 +0000 |
|---|---|---|
| committer | jdc <jdc@pkgsrc.org> | 2012-08-15 18:28:20 +0000 |
| commit | e1e01df11d300c94724092ebfe5f18ab2c1ddd35 (patch) | |
| tree | 56ccdbed3267e4d19b269236c77ab0c6087c97a5 | |
| parent | ea5ad9d886b4fe2f9fd2bd22546e3d328a3131fe (diff) | |
| download | pkgsrc-e1e01df11d300c94724092ebfe5f18ab2c1ddd35.tar.gz | |
Move the sparc64/gcc4 hack from Makefile to hacks.mk, where it belongs.
Unlimit the stack size, so that we can compile on NetBSD/sparc64.
| -rw-r--r-- | devel/boost-libs/Makefile | 9 | ||||
| -rw-r--r-- | devel/boost-libs/hacks.mk | 14 |
2 files changed, 17 insertions, 6 deletions
diff --git a/devel/boost-libs/Makefile b/devel/boost-libs/Makefile index e2927d8ebf2..a187d9a65ee 100644 --- a/devel/boost-libs/Makefile +++ b/devel/boost-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2012/07/02 07:02:25 adam Exp $ +# $NetBSD: Makefile,v 1.23 2012/08/15 18:28:20 jdc Exp $ BOOST_PACKAGE= libs BOOST_COMMENT= (binary libraries) @@ -16,12 +16,9 @@ BJAM_ARGS+= --without-python BJAM_ARGS+= pch=off .endif -.include "../../devel/boost-jam/bjam.mk" +UNLIMIT_RESOURCES+= stacksize -# Hack: gcc on sparc64 catches an illegal instruction compiling graphml.o -.if ${MACHINE_ARCH} == "sparc64" && !empty(CC_VERSION:Mgcc*) -BUILDLINK_TRANSFORM+= rename:-O3:-O1 -.endif +.include "../../devel/boost-jam/bjam.mk" do-build: bjam-build diff --git a/devel/boost-libs/hacks.mk b/devel/boost-libs/hacks.mk new file mode 100644 index 00000000000..34eaa1e8bf1 --- /dev/null +++ b/devel/boost-libs/hacks.mk @@ -0,0 +1,14 @@ +# $NetBSD: hacks.mk,v 1.3 2012/08/15 18:28:21 jdc Exp $ + +.if !defined(BOOST_LIBS_HACKS_MK) +BOOST_LIBS_HACKS_MK= defined + +.include "../../mk/compiler.mk" + +# gcc 4 on sparc64 catches an illegal instruction when compiling graphml.cpp +.if ${MACHINE_ARCH} == "sparc64" && !empty(CC_VERSION:Mgcc-4*) +PKG_HACKS+= optimisation +BUILDLINK_TRANSFORM+= rename:-O3:-O1 +.endif + +.endif # BOOST_LIBS_HACKS_MK |