boost: compiles with gcc-4.2

svn path=/nixpkgs/trunk/; revision=10327
2008-01-28 19:36:57 +00:00 · 2008-01-28 19:36:57 +00:00 · 1e072c634d
parent 6ed85d8e95
commit 1e072c634d
2 changed files with 12 additions and 0 deletions
--- a/pkgs/development/libraries/boost/default.nix
+++ b/pkgs/development/libraries/boost/default.nix
@ -10,5 +10,6 @@ stdenv.mkDerivation {
  preConfigure="
    sed -e 's@^BJAM_CONFIG=\"\"@BJAM_CONFIG=\"--layout=system release threading=multi link=shared\"@g' -i configure
  ";
+  patches = [./gcc-4.2.patch];
  configureFlags="--with-icu=${icu}";
 }
--- a/pkgs/development/libraries/boost/gcc-4.2.patch
+++ b/pkgs/development/libraries/boost/gcc-4.2.patch
@ -0,0 +1,11 @@
+Index: trunk/tools/jam/src/build.jam
+===================================================================
+--- trunk/tools/jam/src/build.jam (revision 40095)
+++ trunk/tools/jam/src/build.jam (revision 41036)
+@@ -176,5 +176,5 @@
+ ## GCC 2.x, 3.x, 4.x
+ toolset gcc gcc : "-o " : -D
+-    : -pedantic
+    : -pedantic -fno-strict-aliasing
+     [ opt --release : [ opt --symbols : -g : -s ] -O3 ]
+     [ opt --debug : -g -O0 -fno-inline ]