diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2008-01-28 19:36:57 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2008-01-28 19:36:57 +0000 |
| commit | 1e072c634d8137108ff4fc35aaca18bdd094d62e (patch) | |
| tree | 54d33eeeaa4ab2be710020e809d1a7a2865326b9 | |
| parent | 6ed85d8e954b9e78bd79802a0f87c805371c227f (diff) | |
| download | nixpkgs-1e072c634d8137108ff4fc35aaca18bdd094d62e.tar nixpkgs-1e072c634d8137108ff4fc35aaca18bdd094d62e.tar.gz nixpkgs-1e072c634d8137108ff4fc35aaca18bdd094d62e.tar.bz2 nixpkgs-1e072c634d8137108ff4fc35aaca18bdd094d62e.tar.lz nixpkgs-1e072c634d8137108ff4fc35aaca18bdd094d62e.tar.xz nixpkgs-1e072c634d8137108ff4fc35aaca18bdd094d62e.tar.zst nixpkgs-1e072c634d8137108ff4fc35aaca18bdd094d62e.zip | |
boost: compiles with gcc-4.2
svn path=/nixpkgs/trunk/; revision=10327
| -rw-r--r-- | pkgs/development/libraries/boost/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/boost/gcc-4.2.patch | 11 |
2 files changed, 12 insertions, 0 deletions
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 ] |