diff options
| author | Georges Dubus <georges.dubus@compiletoi.net> | 2015-01-14 16:02:01 +0100 |
|---|---|---|
| committer | Georges Dubus <georges.dubus@compiletoi.net> | 2015-01-14 16:02:08 +0100 |
| commit | c2f8791e832bc5aabfc10df487c6776704530a3a (patch) | |
| tree | ab19a41ce9a2237d8884e07dae62998fc4d6ceb0 /pkgs | |
| parent | 5b70a64286d578523adabd0bff958ca721b5b0f6 (diff) | |
| download | nixpkgs-c2f8791e832bc5aabfc10df487c6776704530a3a.tar nixpkgs-c2f8791e832bc5aabfc10df487c6776704530a3a.tar.gz nixpkgs-c2f8791e832bc5aabfc10df487c6776704530a3a.tar.bz2 nixpkgs-c2f8791e832bc5aabfc10df487c6776704530a3a.tar.lz nixpkgs-c2f8791e832bc5aabfc10df487c6776704530a3a.tar.xz nixpkgs-c2f8791e832bc5aabfc10df487c6776704530a3a.tar.zst nixpkgs-c2f8791e832bc5aabfc10df487c6776704530a3a.zip | |
pypy: added patch to fix build with gcc 4.9.2
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/interpreters/pypy/2.4/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/interpreters/pypy/2.4/fix-gcc-4-9-2.patch | 19 |
2 files changed, 22 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/pypy/2.4/default.nix b/pkgs/development/interpreters/pypy/2.4/default.nix index c5d86766d1f..8a6f2b61bb0 100644 --- a/pkgs/development/interpreters/pypy/2.4/default.nix +++ b/pkgs/development/interpreters/pypy/2.4/default.nix @@ -27,9 +27,11 @@ let C_INCLUDE_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/include") buildInputs); LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/lib") buildInputs); - LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/lib") + LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/lib") (stdenv.lib.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs)); + patches = [ ./fix-gcc-4-9-2.patch ]; + preConfigure = '' substituteInPlace Makefile \ --replace "-Ojit" "-Ojit --batch" \ diff --git a/pkgs/development/interpreters/pypy/2.4/fix-gcc-4-9-2.patch b/pkgs/development/interpreters/pypy/2.4/fix-gcc-4-9-2.patch new file mode 100644 index 00000000000..dc01c5795dd --- /dev/null +++ b/pkgs/development/interpreters/pypy/2.4/fix-gcc-4-9-2.patch @@ -0,0 +1,19 @@ +--- a/rpython/translator/c/gcc/trackgcroot.py ++++ b/rpython/translator/c/gcc/trackgcroot.py +@@ -590,7 +590,7 @@ + + # The various cmov* operations + for name in ''' +- e ne g ge l le a ae b be p np s ns o no ++ e ne g ge l le a ae b be nb p np s ns o no + '''.split(): + locals()['visit_cmov' + name] = binary_insn + locals()['visit_cmov' + name + 'l'] = binary_insn +@@ -837,6 +837,7 @@ + visit_jb = conditional_jump + visit_jbe = conditional_jump + visit_jp = conditional_jump ++ visit_jnb = conditional_jump + visit_jnp = conditional_jump + visit_js = conditional_jump + visit_jns = conditional_jump |