public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix boost-1.49.0 on Darwin

This commit is contained in:
Rob Vermaas 2013-05-23 22:17:55 +02:00
parent 8ac0a0ac46
commit da70c21cf7
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/boost/1.49.nix
View File

@ -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;

40
pkgs/development/libraries/boost/boost-149-darwin.patch Normal file
View File

@ -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>')