[arch-commits] Commit in valgrind/trunk (PKGBUILD)

[Allan McRae]

    Date: Thursday, October 21, 2010 @ 23:11:09
  Author: allan
Revision: 96535

upgpkg: valgrind 3.6.0-1
upstream update

Modified:
  valgrind/trunk/PKGBUILD

----------+
 PKGBUILD |   34 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-22 01:09:46 UTC (rev 96534)
+++ PKGBUILD	2010-10-22 03:11:09 UTC (rev 96535)
@@ -3,8 +3,8 @@
 # Maintainer: Allan McRae <allan at archlinux.org>
 
 pkgname=valgrind
-pkgver=3.5.0
-pkgrel=6
+pkgver=3.6.0
+pkgrel=1
 pkgdesc="A tool to help find memory-management problems in programs"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -13,17 +13,9 @@
 makedepends=('gdb')
 options=('!emptydirs')
 source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
-        glibc-patch-version.patch
-        glibc-2.12.patch
-        valgrind-3.5.0-stat_h.patch
-        valgrind-3.5.0-elf-indirect-functions.patch
-        valgrind-3.5.0-initialise-isifunc.patch)
-md5sums=('f03522a4687cf76c676c9494fcc0a517'
-         'b657f0ebdde3d9aefc9fd16f9e653702'
-         '0ac843aecfc539a53ae88c48b1a17047'
-         'e435a0debedf207b279256eff50c68f6'
-         '10af3a098fa1f62441b7e52dbce38969'
-         'cbdee7745fabac7119a8897a6c7147a6')
+        glibc-patch-version.patch)
+md5sums=('b289c5f4ab8e39741602445f1dd09b34'
+         'b657f0ebdde3d9aefc9fd16f9e653702')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -31,22 +23,18 @@
   # make sure our CFLAGS are respected
   sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.in
 
-  patch -Np1 -i ${srcdir}/glibc-patch-version.patch || return 1
-  patch -Np0 -i ${srcdir}/glibc-2.12.patch || return 1
-  patch -Np1 -i ${srcdir}/valgrind-3.5.0-stat_h.patch || return 1
-  patch -Np0 -i ${srcdir}/valgrind-3.5.0-elf-indirect-functions.patch || return 1
-  patch -Np0 -i ${srcdir}/valgrind-3.5.0-initialise-isifunc.patch || return 1
-  autoreconf
+  # prevent need to rebuild with glibc patch level version bumps
+  patch -Np1 -i ${srcdir}/glibc-patch-version.patch
 
   if [ "${CARCH}" = "x86_64" ]; then
-    ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit || return 1
+    ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit
   else
-    ./configure --prefix=/usr --mandir=/usr/share/man || return 1
+    ./configure --prefix=/usr --mandir=/usr/share/man
   fi
-  make || return 1
+  make
 }
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install
 }