summaryrefslogtreecommitdiff
path: root/meta-pkgs
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2006-01-21 10:12:40 +0000
committerjmmv <jmmv@pkgsrc.org>2006-01-21 10:12:40 +0000
commit6939e1e3edba144c6b50e144e93e5e6d0f28f4c8 (patch)
treeacc5465894131edbce42fb437b44fadb42fa19c5 /meta-pkgs
parente9f81c65bc9b4f9c6d406dcc967c01ffa77dd79a (diff)
downloadpkgsrc-6939e1e3edba144c6b50e144e93e5e6d0f28f4c8.tar.gz
Fix installed name of Boost libraries under Mac OS X. They need to have
the directory they'll live in as part of their name, or otherwise they cannot be found at runtime.
Diffstat (limited to 'meta-pkgs')
-rw-r--r--meta-pkgs/boost/distinfo4
-rw-r--r--meta-pkgs/boost/patches/patch-ae13
2 files changed, 13 insertions, 4 deletions
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)"
+ }