diff options
Diffstat (limited to 'dev-python/pypy3')
| -rw-r--r-- | dev-python/pypy3/files/pypy3-2.4.0-gcc-4.9.patch | 26 | ||||
| -rw-r--r-- | dev-python/pypy3/pypy3-2.4.0.ebuild | 4 |
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 000000000000..dd3a688c45f6 --- /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 eda2f1db431f..9903c1bc0026 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 |