[arch-commits] CVS update of extra/devel/valgrind (PKGBUILD amd64.patch)

[Eric Belanger]

    Date: Friday, August 24, 2007 @ 02:34:47
  Author: eric
    Path: /home/cvs-extra/extra/devel/valgrind

   Added: amd64.patch (1.1)
Modified: PKGBUILD (1.13 -> 1.14)

upgpkg: valgrind 3.2.3-2.1
fixed illegal instruction on x86_64 (close FS#7880)


-------------+
 PKGBUILD    |   11 ++++++-----
 amd64.patch |   12 ++++++++++++
 2 files changed, 18 insertions(+), 5 deletions(-)


Index: extra/devel/valgrind/PKGBUILD
diff -u extra/devel/valgrind/PKGBUILD:1.13 extra/devel/valgrind/PKGBUILD:1.14
--- extra/devel/valgrind/PKGBUILD:1.13	Tue Aug 21 16:14:00 2007
+++ extra/devel/valgrind/PKGBUILD	Fri Aug 24 02:34:46 2007
@@ -1,20 +1,23 @@
-# $Id: PKGBUILD,v 1.13 2007/08/21 20:14:00 tpowa Exp $
+# $Id: PKGBUILD,v 1.14 2007/08/24 06:34:46 eric Exp $
 # Maintainer: aurelien <aurelien at archlinux.org>
 # Contributor: Aurelien Foret <orelien at chez.com>
 pkgname=valgrind
 pkgver=3.2.3
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A tool to help you find memory-management problems in your programs"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://valgrind.org/"
 depends=('glibc>=2.6')
-source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2 glibc-2.6.patch)
+source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2 glibc-2.6.patch amd64.patch)
+md5sums=('978847992b136c8d8cb5c6559a91df1c' '5e15d974cd371bd97ad5b957f54970a2'\
+         '0bbafb927c9c2ca42b862db08358160b')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
   export MAKEFLAGS="-j1"
   patch -Np1 -i ../glibc-2.6.patch || return 1
+  [ "${CARCH}" = "x86_64" ] && (patch -Np1 < ../amd64.patch || return 1)
   autoconf
   # fix glibc-2.6 compiling
   if [ "${CARCH}" = "x86_64" ]; then
@@ -27,5 +30,3 @@
   make || return 1
   make DESTDIR=${startdir}/pkg install
 }
-md5sums=('978847992b136c8d8cb5c6559a91df1c'
-         '5e15d974cd371bd97ad5b957f54970a2')
Index: extra/devel/valgrind/amd64.patch
diff -u /dev/null extra/devel/valgrind/amd64.patch:1.1
--- /dev/null	Fri Aug 24 02:34:46 2007
+++ extra/devel/valgrind/amd64.patch	Fri Aug 24 02:34:47 2007
@@ -0,0 +1,12 @@
+diff -Naur valgrind-3.2.3-orig/VEX/priv/guest-amd64/toIR.c valgrind-3.2.3/VEX/priv/guest-amd64/toIR.c
+--- valgrind-3.2.3-orig/VEX/priv/guest-amd64/toIR.c	2007-08-24 01:52:43.000000000 -0400
++++ valgrind-3.2.3/VEX/priv/guest-amd64/toIR.c	2007-08-24 01:54:32.000000000 -0400
+@@ -8334,7 +8334,7 @@
+       as many invalid combinations as possible. */
+    n_prefixes = 0;
+    while (True) {
+-      if (n_prefixes > 5) goto decode_failure;
++      if (n_prefixes > 7) goto decode_failure;
+       pre = getUChar(delta);
+       switch (pre) {
+          case 0x66: pfx |= PFX_66; break;