From 40383877a9896d70e4243e6238b9317ee1267c32 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 28 Jan 2008 20:25:21 +0000
Subject: [PATCH] Revert "boost: compiles with gcc-4.2": it is not needed in
 trunk

This reverts commit 10327.

svn path=/nixpkgs/trunk/; revision=10368
---
 pkgs/development/libraries/boost/default.nix   |  1 -
 pkgs/development/libraries/boost/gcc-4.2.patch | 11 -----------
 2 files changed, 12 deletions(-)
 delete 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 fe4cdcf0337..5040a763ab8 100644
--- a/pkgs/development/libraries/boost/default.nix
+++ b/pkgs/development/libraries/boost/default.nix
@@ -10,6 +10,5 @@ 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
deleted file mode 100644
index 6c2210d831d..00000000000
--- a/pkgs/development/libraries/boost/gcc-4.2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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 ]