diff options
| author | jmmv <jmmv@pkgsrc.org> | 2006-01-21 09:02:16 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2006-01-21 09:02:16 +0000 |
| commit | 5690a6271fcc598976a79b63bd26cacdf233b045 (patch) | |
| tree | abf7d017b765fe24fb6049787f5c8751ddb6dacb /devel | |
| parent | 9898a9070f1756839c2e3dd83e8380c9b2111fed (diff) | |
| download | pkgsrc-5690a6271fcc598976a79b63bd26cacdf233b045.tar.gz | |
Fix build and install of Boost under Mac OS X:
- Correctly use threads.
- Use the correct tool set.
- Make libraries (Boost.Test) with undefined symbols build correctly.
- Change the installed library names so that they match other systems
(thus avoiding manual PLIST substitutions). There is a hack here,
though, to let the dylib stuff kick in...
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/boost-build/bjam.mk | 11 | ||||
| -rw-r--r-- | devel/boost-build/toolset.mk | 6 |
2 files changed, 13 insertions, 4 deletions
diff --git a/devel/boost-build/bjam.mk b/devel/boost-build/bjam.mk index 33b16c49d54..7388704b848 100644 --- a/devel/boost-build/bjam.mk +++ b/devel/boost-build/bjam.mk @@ -1,4 +1,4 @@ -# $NetBSD: bjam.mk,v 1.2 2005/03/25 12:45:09 jmmv Exp $ +# $NetBSD: bjam.mk,v 1.3 2006/01/21 09:02:16 jmmv Exp $ # .include "../../devel/boost-build/buildlink3.mk" @@ -15,13 +15,20 @@ BJAM_ARGS+= -sTOOLS=${BOOST_TOOLSET} .if defined(BOOST_DEBUG) && !empty(BOOST_DEBUG:M[Yy][Ee][Ss]) BJAM_BUILD+= debug .endif -BJAM_BUILD+= <linkflags>-Wl,-R${PREFIX}/lib +BJAM_BUILD+= <linkflags>${COMPILER_RPATH_FLAG}${PREFIX}/lib BJAM_BUILD+= <threading>multi BJAM_BUILD+= release BJAM_CMD= ${SETENV} ${MAKE_ENV} ${BJAM} ${BJAM_ARGS} bjam-build: @cd ${WRKSRC} && ${BJAM_CMD} stage +.if ${OPSYS} == "Darwin" + @cd ${WRKSRC}/stage/lib && \ + for f in *-mt.dylib; do \ + ${LN} -s $${f} \ + `${ECHO} $${f} | ${SED} 's|.dylib|.${BOOST_VERSION}.dylib|'`; \ + done +.endif bjam-install: @cd ${WRKSRC} && ${BJAM_CMD} install diff --git a/devel/boost-build/toolset.mk b/devel/boost-build/toolset.mk index ab4e6efebab..d6b236cba7b 100644 --- a/devel/boost-build/toolset.mk +++ b/devel/boost-build/toolset.mk @@ -1,8 +1,10 @@ -# $NetBSD: toolset.mk,v 1.1 2005/02/26 22:48:35 jmmv Exp $ +# $NetBSD: toolset.mk,v 1.2 2006/01/21 09:02:16 jmmv Exp $ .include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Mgcc) +.if ${OPSYS} == "Darwin" +BOOST_TOOLSET= darwin +.elif !empty(PKGSRC_COMPILER:Mgcc) BOOST_TOOLSET= gcc .elif !empty(PKGSRC_COMPILER:Mmipspro*) BOOST_TOOLSET= mipspro |