[arch-commits] Commit in pypy3/trunk (PKGBUILD trackgcroot-new-ops.patch)

[Evangelos Foutras]

    Date: Tuesday, September 8, 2015 @ 02:40:09
  Author: foutrelis
Revision: 139553

Add patch from Debian to fix build failure

Added:
  pypy3/trunk/trackgcroot-new-ops.patch
Modified:
  pypy3/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   11 +++++++++--
 trackgcroot-new-ops.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-07 22:53:49 UTC (rev 139552)
+++ PKGBUILD	2015-09-08 00:40:09 UTC (rev 139553)
@@ -18,9 +18,16 @@
 options=(!buildflags)
 license=('custom:MIT')
 #source=("hg+https://bitbucket.org/pypy/pypy#revision=$_hgrev")
-source=("https://bitbucket.org/pypy/pypy/downloads/$pkgname-$_pkgver-src.tar.bz2")
-md5sums=('96ba72916114d16904e12562b5d84e51')
+source=("https://bitbucket.org/pypy/pypy/downloads/$pkgname-$_pkgver-src.tar.bz2"
+        "trackgcroot-new-ops.patch")
+md5sums=('96ba72916114d16904e12562b5d84e51'
+         '3294fd2919c3372615b59c5f82552f64')
 
+prepare() {
+  cd ${pkgname}-${_pkgver}-src
+  patch -Np1 -i ../trackgcroot-new-ops.patch
+}
+
 build() {
   cd ${pkgname}-${_pkgver}-src/pypy/goal
 

Added: trackgcroot-new-ops.patch
===================================================================
--- trackgcroot-new-ops.patch	                        (rev 0)
+++ trackgcroot-new-ops.patch	2015-09-08 00:40:09 UTC (rev 139553)
@@ -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 at 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