diff options
| author | Rob Vermaas <rob.vermaas@gmail.com> | 2013-05-23 22:17:55 +0200 |
|---|---|---|
| committer | Rob Vermaas <rob.vermaas@gmail.com> | 2013-05-23 22:19:58 +0200 |
| commit | da70c21cf72e320e643e16751883ae00334ef16c (patch) | |
| tree | 1ba6dfbad6d32a927eb351c7e8b9f2bd92b8b2a3 /pkgs | |
| parent | 8ac0a0ac46616f270861df50936cdecf7054875f (diff) | |
| download | nixpkgs-da70c21cf72e320e643e16751883ae00334ef16c.tar nixpkgs-da70c21cf72e320e643e16751883ae00334ef16c.tar.gz nixpkgs-da70c21cf72e320e643e16751883ae00334ef16c.tar.bz2 nixpkgs-da70c21cf72e320e643e16751883ae00334ef16c.tar.lz nixpkgs-da70c21cf72e320e643e16751883ae00334ef16c.tar.xz nixpkgs-da70c21cf72e320e643e16751883ae00334ef16c.tar.zst nixpkgs-da70c21cf72e320e643e16751883ae00334ef16c.zip | |
Fix boost-1.49.0 on Darwin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/boost/1.49.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/boost/boost-149-darwin.patch | 40 |
2 files changed, 41 insertions, 1 deletions
diff --git a/pkgs/development/libraries/boost/1.49.nix b/pkgs/development/libraries/boost/1.49.nix index e0ba0630cd0..6035232caf6 100644 --- a/pkgs/development/libraries/boost/1.49.nix +++ b/pkgs/development/libraries/boost/1.49.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { }; # See <http://svn.boost.org/trac/boost/ticket/4688>. - patches = [ ./boost_filesystem_post_1_49_0.patch ./time_utc.patch ]; + patches = [ ./boost_filesystem_post_1_49_0.patch ./time_utc.patch ] ++ (stdenv.lib.optional stdenv.isDarwin ./boost-149-darwin.patch ); enableParallelBuilding = true; diff --git a/pkgs/development/libraries/boost/boost-149-darwin.patch b/pkgs/development/libraries/boost/boost-149-darwin.patch new file mode 100644 index 00000000000..2485f883afc --- /dev/null +++ b/pkgs/development/libraries/boost/boost-149-darwin.patch @@ -0,0 +1,40 @@ +diff -rc boost_1_49_0/tools/build/v2/tools/darwin.jam boost_1_49_0-new/tools/build/v2/tools/darwin.jam +*** boost_1_49_0/tools/build/v2/tools/darwin.jam Mon Jun 6 22:36:21 2011 +--- boost_1_49_0-new/tools/build/v2/tools/darwin.jam Thu May 23 22:07:45 2013 +*************** +*** 498,504 **** + flags darwin.compile OPTIONS <link>shared : -dynamic ; + + # Misc options. +! flags darwin.compile OPTIONS : -no-cpp-precomp -gdwarf-2 -fexceptions ; + #~ flags darwin.link OPTIONS : -fexceptions ; + + # Add the framework names to use. +--- 498,504 ---- + flags darwin.compile OPTIONS <link>shared : -dynamic ; + + # Misc options. +! flags darwin.compile OPTIONS : -gdwarf-2 -fexceptions ; + #~ flags darwin.link OPTIONS : -fexceptions ; + + # Add the framework names to use. +diff -rc boost_1_49_0/tools/build/v2/tools/darwin.py boost_1_49_0-new/tools/build/v2/tools/darwin.py +*** boost_1_49_0/tools/build/v2/tools/darwin.py Wed Oct 28 08:47:51 2009 +--- boost_1_49_0-new/tools/build/v2/tools/darwin.py Thu May 23 21:58:12 2013 +*************** +*** 37,43 **** + feature.feature ('framework', [], ['free']) + + toolset.flags ('darwin.compile', 'OPTIONS', '<link>shared', ['-dynamic']) +! toolset.flags ('darwin.compile', 'OPTIONS', None, ['-Wno-long-double', '-no-cpp-precomp']) + toolset.flags ('darwin.compile.c++', 'OPTIONS', None, ['-fcoalesce-templates']) + + toolset.flags ('darwin.link', 'FRAMEWORK', '<framework>') +--- 37,43 ---- + feature.feature ('framework', [], ['free']) + + toolset.flags ('darwin.compile', 'OPTIONS', '<link>shared', ['-dynamic']) +! toolset.flags ('darwin.compile', 'OPTIONS', None, ['-Wno-long-double']) + toolset.flags ('darwin.compile.c++', 'OPTIONS', None, ['-fcoalesce-templates']) + + toolset.flags ('darwin.link', 'FRAMEWORK', '<framework>') |