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 /meta-pkgs | |
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 'meta-pkgs')
-rw-r--r-- | meta-pkgs/boost/distinfo | 6 | ||||
-rw-r--r-- | meta-pkgs/boost/patches/patch-ad | 6 | ||||
-rw-r--r-- | meta-pkgs/boost/patches/patch-ae | 12 | ||||
-rw-r--r-- | meta-pkgs/boost/patches/patch-ag | 12 |
4 files changed, 31 insertions, 5 deletions
diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo index 39257b163b8..c438d486ebf 100644 --- a/meta-pkgs/boost/distinfo +++ b/meta-pkgs/boost/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2006/01/20 20:40:19 jmmv Exp $ +$NetBSD: distinfo,v 1.7 2006/01/21 09:02:16 jmmv Exp $ SHA1 (boost_1_33_1.tar.bz2) = 22682f75ff0d1ea548688e78c8cca83d599ca576 RMD160 (boost_1_33_1.tar.bz2) = 3d5999d321b558f74d786bec52ee1b1fcd7e7152 @@ -6,6 +6,8 @@ Size (boost_1_33_1.tar.bz2) = 11507161 bytes SHA1 (patch-aa) = 957dad8d5993f0d28b399eedb2d0ae14ecfebc4c SHA1 (patch-ab) = 197c51ac67d74923d02f8a9746b5d2e0f7b84736 SHA1 (patch-ac) = 453d4107df03e96e66cbdbebceebdfcbed2710c1 -SHA1 (patch-ad) = f5ab062abdb23b0586d08aad843debf4d6162c87 +SHA1 (patch-ad) = 4d8bd0cea4b6758d52890cec420892f3ece4ea09 +SHA1 (patch-ae) = 87d4aa6ae5162de7489bae5315a018670c8045cb SHA1 (patch-af) = 64a6fa2be7a526a0a3e6f47d5f703d7253a51615 +SHA1 (patch-ag) = 6c862a0f50590327344d6973617ccc56df67fa76 SHA1 (patch-ah) = e16c08bb0f63e63ae082e9d83c588e3adcf9cb3b diff --git a/meta-pkgs/boost/patches/patch-ad b/meta-pkgs/boost/patches/patch-ad index e6ae53911af..ee5d77c5720 100644 --- a/meta-pkgs/boost/patches/patch-ad +++ b/meta-pkgs/boost/patches/patch-ad @@ -1,13 +1,13 @@ -$NetBSD: patch-ad,v 1.3 2006/01/12 22:48:46 joerg Exp $ +$NetBSD: patch-ad,v 1.4 2006/01/21 09:02:16 jmmv Exp $ ---- boost/config/suffix.hpp.orig 2005-06-21 12:35:22.000000000 +0000 +--- boost/config/suffix.hpp.orig 2006-01-20 21:59:33.000000000 +0100 +++ boost/config/suffix.hpp @@ -213,7 +213,7 @@ // from here then add to the appropriate compiler section): // #if (defined(__MT__) || defined(_MT) || defined(_REENTRANT) \ - || defined(_PTHREADS)) && !defined(BOOST_HAS_THREADS) -+ || defined(_PTHREADS) || defined(__DragonFly__)) && !defined(BOOST_HAS_THREADS) ++ || defined(_PTHREADS) || defined(__DragonFly__) || defined(__APPLE__)) && !defined(BOOST_HAS_THREADS) # define BOOST_HAS_THREADS #endif diff --git a/meta-pkgs/boost/patches/patch-ae b/meta-pkgs/boost/patches/patch-ae new file mode 100644 index 00000000000..4dbd6e3e122 --- /dev/null +++ b/meta-pkgs/boost/patches/patch-ae @@ -0,0 +1,12 @@ +$NetBSD: patch-ae,v 1.3 2006/01/21 09:02:16 jmmv Exp $ + +--- tools/build/v1/darwin-tools.jam.orig 2006-01-21 00:05:33.000000000 +0100 ++++ tools/build/v1/darwin-tools.jam +@@ -149,6 +149,7 @@ if -bind_at_load in $(.LINKFLAGS) + .LINKFLAGS = [ difference $(.LINKFLAGS) : -bind_at_load ] ; + } + flags darwin LINKFLAGS : $(.LINKFLAGS) ; ++flags darwin LINKFLAGS : -flat_namespace -undefined suppress ; + + + #### Link #### diff --git a/meta-pkgs/boost/patches/patch-ag b/meta-pkgs/boost/patches/patch-ag new file mode 100644 index 00000000000..bf86a0a492e --- /dev/null +++ b/meta-pkgs/boost/patches/patch-ag @@ -0,0 +1,12 @@ +$NetBSD: patch-ag,v 1.3 2006/01/21 09:02:16 jmmv Exp $ + +--- tools/build/v1/boost-base.jam.orig 2006-01-21 00:28:08.000000000 +0100 ++++ tools/build/v1/boost-base.jam +@@ -2616,6 +2616,7 @@ rule common-variant-tag ( toolset varian + + local thread-tag = ; + if <threading>multi in $(properties) { thread-tag = mt ; } ++ if $(OS) = MACOSX { thread-tag = mt ; } + + local runtime-tag = ; + if <runtime-link>static in $(properties) { runtime-tag += s ; } |