diff options
| -rw-r--r-- | devel/boost-build/bjam.mk | 5 | ||||
| -rw-r--r-- | meta-pkgs/boost/distinfo | 4 | ||||
| -rw-r--r-- | meta-pkgs/boost/patches/patch-ae | 13 |
3 files changed, 17 insertions, 5 deletions
diff --git a/devel/boost-build/bjam.mk b/devel/boost-build/bjam.mk index 7388704b848..3c6bd6c3334 100644 --- a/devel/boost-build/bjam.mk +++ b/devel/boost-build/bjam.mk @@ -1,4 +1,4 @@ -# $NetBSD: bjam.mk,v 1.3 2006/01/21 09:02:16 jmmv Exp $ +# $NetBSD: bjam.mk,v 1.4 2006/01/21 10:12:40 jmmv Exp $ # .include "../../devel/boost-build/buildlink3.mk" @@ -12,6 +12,9 @@ BJAM_ARGS+= --layout=system BJAM_ARGS+= --prefix=${PREFIX} BJAM_ARGS+= -sBUILD=${BJAM_BUILD:Q} BJAM_ARGS+= -sTOOLS=${BOOST_TOOLSET} +.if ${OPSYS} == "Darwin" +BJAM_ARGS+= -sTARGET_LIBDIR=${PREFIX}/lib +.endif .if defined(BOOST_DEBUG) && !empty(BOOST_DEBUG:M[Yy][Ee][Ss]) BJAM_BUILD+= debug .endif diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo index c438d486ebf..ecbca327135 100644 --- a/meta-pkgs/boost/distinfo +++ b/meta-pkgs/boost/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2006/01/21 09:02:16 jmmv Exp $ +$NetBSD: distinfo,v 1.8 2006/01/21 10:12:40 jmmv Exp $ SHA1 (boost_1_33_1.tar.bz2) = 22682f75ff0d1ea548688e78c8cca83d599ca576 RMD160 (boost_1_33_1.tar.bz2) = 3d5999d321b558f74d786bec52ee1b1fcd7e7152 @@ -7,7 +7,7 @@ SHA1 (patch-aa) = 957dad8d5993f0d28b399eedb2d0ae14ecfebc4c SHA1 (patch-ab) = 197c51ac67d74923d02f8a9746b5d2e0f7b84736 SHA1 (patch-ac) = 453d4107df03e96e66cbdbebceebdfcbed2710c1 SHA1 (patch-ad) = 4d8bd0cea4b6758d52890cec420892f3ece4ea09 -SHA1 (patch-ae) = 87d4aa6ae5162de7489bae5315a018670c8045cb +SHA1 (patch-ae) = e557356101204290a70084eb284d90ce8f4cbd71 SHA1 (patch-af) = 64a6fa2be7a526a0a3e6f47d5f703d7253a51615 SHA1 (patch-ag) = 6c862a0f50590327344d6973617ccc56df67fa76 SHA1 (patch-ah) = e16c08bb0f63e63ae082e9d83c588e3adcf9cb3b diff --git a/meta-pkgs/boost/patches/patch-ae b/meta-pkgs/boost/patches/patch-ae index 4dbd6e3e122..cb46b29391c 100644 --- a/meta-pkgs/boost/patches/patch-ae +++ b/meta-pkgs/boost/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.3 2006/01/21 09:02:16 jmmv Exp $ +$NetBSD: patch-ae,v 1.4 2006/01/21 10:12:40 jmmv Exp $ ---- tools/build/v1/darwin-tools.jam.orig 2006-01-21 00:05:33.000000000 +0100 +--- tools/build/v1/darwin-tools.jam.orig 2005-05-11 08:15:20.000000000 +0200 +++ tools/build/v1/darwin-tools.jam @@ -149,6 +149,7 @@ if -bind_at_load in $(.LINKFLAGS) .LINKFLAGS = [ difference $(.LINKFLAGS) : -bind_at_load ] ; @@ -10,3 +10,12 @@ $NetBSD: patch-ae,v 1.3 2006/01/21 09:02:16 jmmv Exp $ #### Link #### +@@ -187,7 +188,7 @@ actions darwin-Link-DyLib-action bind NE + && \ + $(.GCC_BIN_DIR)$(.GXX) $(LINKFLAGS) -o "$(<[1])" "$(<[1]:S=.lo)" \ + -F$(FRAMEWORKS:D) -framework$(_)$(FRAMEWORKS:D=) \ +- -L"$(LIBPATH:T)" -L"$(STDLIBPATH:T)" "$(NEEDLIBS)" "$(NEEDLIBS)" -l$(FINDLIBS) -dynamiclib -install_name "$(<[1]:D=:S=.dylib)" \ ++ -L"$(LIBPATH:T)" -L"$(STDLIBPATH:T)" "$(NEEDLIBS)" "$(NEEDLIBS)" -l$(FINDLIBS) -dynamiclib -install_name "$(TARGET_LIBDIR)/$(<[1]:D=:S=.dylib)" \ + && \ + rm -f "$(<[1]:S=.lo)" + } |