[arch-commits] Commit in valgrind-multilib/trunk (2 files)

[Laurent Carlier]

    Date: Saturday, February 8, 2014 @ 12:06:51
  Author: lcarlier
Revision: 105447

prepare for the lib32-glibc-2.19 rebuild

Added:
  valgrind-multilib/trunk/valgrind-3.9.0-glibc-2.19.patch
Modified:
  valgrind-multilib/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   16 ++++++++++++----
 valgrind-3.9.0-glibc-2.19.patch |   37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-08 10:44:41 UTC (rev 105446)
+++ PKGBUILD	2014-02-08 11:06:51 UTC (rev 105447)
@@ -4,19 +4,27 @@
 
 pkgname=valgrind-multilib
 pkgver=3.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool to help find memory-management problems in programs for multilib"
 arch=('x86_64')
 license=('GPL')
 url="http://valgrind.org/"
-depends=('lib32-glibc>=2.18' 'lib32-glibc<2.19' 'perl')
+depends=('lib32-glibc>=2.19' 'lib32-glibc<2.20' 'perl')
 makedepends=('gdb' 'gcc-multilib')
 options=('staticlibs' '!emptydirs')
 provides=('valgrind')
 conflicts=('valgrind')
-source=(http://valgrind.org/downloads/valgrind-${pkgver}.tar.bz2)
-md5sums=('0947de8112f946b9ce64764af7be6df2')
+source=(http://valgrind.org/downloads/valgrind-${pkgver}.tar.bz2
+        valgrind-3.9.0-glibc-2.19.patch)
+md5sums=('0947de8112f946b9ce64764af7be6df2'
+         '21020338ad5a93e6f9694946183e8835')
 
+prepare() {
+  cd ${srcdir}/valgrind-${pkgver}
+
+  patch -p1 -i $srcdir/valgrind-3.9.0-glibc-2.19.patch
+}
+
 build() {
   cd ${srcdir}/valgrind-${pkgver}
 

Added: valgrind-3.9.0-glibc-2.19.patch
===================================================================
--- valgrind-3.9.0-glibc-2.19.patch	                        (rev 0)
+++ valgrind-3.9.0-glibc-2.19.patch	2014-02-08 11:06:51 UTC (rev 105447)
@@ -0,0 +1,37 @@
+diff -Naur valgrind-3.9.0-orig/configure valgrind-3.9.0/configure
+--- valgrind-3.9.0-orig/configure	2013-11-01 09:33:32.000000000 +1000
++++ valgrind-3.9.0/configure	2014-02-08 09:28:06.063248544 +1000
+@@ -6689,6 +6689,16 @@
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.19)
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.19 family" >&5
++$as_echo "2.19 family" >&6; }
++
++$as_echo "#define GLIBC_2_19 1" >>confdefs.h
++
++	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++	;;
+      darwin)
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
+ $as_echo "Darwin" >&6; }
+diff -Naur valgrind-3.9.0-orig/configure.ac valgrind-3.9.0/configure.ac
+--- valgrind-3.9.0-orig/configure.ac	2013-11-01 09:28:16.000000000 +1000
++++ valgrind-3.9.0/configure.ac	2014-02-08 09:27:38.870385366 +1000
+@@ -918,6 +918,13 @@
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.19)
++	AC_MSG_RESULT(2.19 family)
++	AC_DEFINE([GLIBC_2_19], 1, [Define to 1 if you're using glibc 2.19.x])
++	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++	;;
+      darwin)
+ 	AC_MSG_RESULT(Darwin)
+ 	AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])