nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 07:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

pypy: added patch to fix build with gcc 4.9.2

Browse Source
This commit is contained in:
Georges Dubus 2015-01-14 16:02:01 +01:00
parent 5b70a64286
commit c2f8791e83
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/pypy/2.4/default.nix
View File

@ -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" \

19
pkgs/development/interpreters/pypy/2.4/fix-gcc-4-9-2.patch Normal file
View File

@ -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