summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2015-08-18 18:34:18 +0200
committerJustin Lecher <jlec@gentoo.org>2015-08-18 18:34:37 +0200
commitbd9b4c3f9787eb28082595d88427b23c61dd25fd (patch)
treecfe124806944b40c90fd6ac7e8ebef8ba8990c91 /dev-python/pypy3
parentpowerpc: delete redundant USE=seccomp masks (diff)
downloadgentoo-bd9b4c3f9787eb28082595d88427b23c61dd25fd.tar.gz
gentoo-bd9b4c3f9787eb28082595d88427b23c61dd25fd.tar.bz2
gentoo-bd9b4c3f9787eb28082595d88427b23c61dd25fd.zip
dev-python/pypy3: Backport for fix gcc-4.9
https://bitbucket.org/pypy/pypy/commits/c1abec418acf30bb04891c3249bc12cbe8f48d4a Bug-Debian: https://bugs.debian.org/771137 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=536920 Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher <jlec@gentoo.org>
Diffstat (limited to 'dev-python/pypy3')
-rw-r--r--dev-python/pypy3/files/pypy3-2.4.0-gcc-4.9.patch26
-rw-r--r--dev-python/pypy3/pypy3-2.4.0.ebuild4
2 files changed, 29 insertions, 1 deletions
diff --git a/dev-python/pypy3/files/pypy3-2.4.0-gcc-4.9.patch b/dev-python/pypy3/files/pypy3-2.4.0-gcc-4.9.patch
new file mode 100644
index 00000000000..dd3a688c45f
--- /dev/null
+++ b/dev-python/pypy3/files/pypy3-2.4.0-gcc-4.9.patch
@@ -0,0 +1,26 @@
+Description: Expect cmovnb and jnb
+ Fixes an FTBFS since gcc 4.9.2, which is emmiting new operations
+Author: Stefano Rivera <stefanor@debian.org>
+Forwarded: https://bitbucket.org/pypy/pypy/commits/c1abec418acf30bb04891c3249bc12cbe8f48d4a
+Bug-Debian: https://bugs.debian.org/771137
+Last-Update: 2014-11-26
+
+--- 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
diff --git a/dev-python/pypy3/pypy3-2.4.0.ebuild b/dev-python/pypy3/pypy3-2.4.0.ebuild
index eda2f1db431..9903c1bc002 100644
--- a/dev-python/pypy3/pypy3-2.4.0.ebuild
+++ b/dev-python/pypy3/pypy3-2.4.0.ebuild
@@ -70,7 +70,9 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}/1.9-scripts-location.patch" \
+ epatch \
+ "${FILESDIR}"/${P}-gcc-4.9.patch \
+ "${FILESDIR}/1.9-scripts-location.patch" \
"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" \
"${FILESDIR}"/2.3.1-shared-lib.patch # 517002