From f1f13ef432829b5e1dff1b3b42029d1163cebdb7 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 15 Dec 2007 23:45:53 +0000
Subject: [PATCH] boost: compiles with gcc-4.2

svn path=/nixpkgs/branches/stdenv-updates/; revision=9945
---
 pkgs/development/libraries/boost/default.nix   |  1 +
 pkgs/development/libraries/boost/gcc-4.2.patch | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 pkgs/development/libraries/boost/gcc-4.2.patch

diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix
index 5040a763ab8..fe4cdcf0337 100644
--- 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}";
 }
diff --git a/pkgs/development/libraries/boost/gcc-4.2.patch b/pkgs/development/libraries/boost/gcc-4.2.patch
new file mode 100644
index 00000000000..6c2210d831d
--- /dev/null
+++ 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 ]