Date: Sunday, February 8, 2015 @ 03:19:47 Author: allan Revision: 231118
upgpkg: valgrind 3.10.1-2 glibc-2.21 rebuild Added: valgrind/trunk/valgrind-3.9.0-glibc-2.21.patch (from rev 231117, valgrind/trunk/valgrind-3.9.0-glibc-2.20.patch) Modified: valgrind/trunk/PKGBUILD Deleted: valgrind/trunk/valgrind-3.9.0-glibc-2.20.patch ---------------------------------+ PKGBUILD | 12 ++++---- valgrind-3.9.0-glibc-2.20.patch | 37 -------------------------- valgrind-3.9.0-glibc-2.21.patch | 54 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 43 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-02-08 01:50:29 UTC (rev 231117) +++ PKGBUILD 2015-02-08 02:19:47 UTC (rev 231118) @@ -4,23 +4,23 @@ pkgname=valgrind pkgver=3.10.1 -pkgrel=1 +pkgrel=2 pkgdesc='A tool to help find memory-management problems in programs' arch=(i686 x86_64) license=(GPL) url='http://valgrind.org/' -depends=('glibc>=2.20' 'glibc<2.21' 'perl') +depends=('glibc>=2.21' 'glibc<2.22' 'perl') makedepends=('gdb' 'openmpi') optdepends=('openmpi: MPI support') -options=('staticlibs' '!emptydirs') +options=('!emptydirs') source=(http://valgrind.org/downloads/$pkgname-$pkgver.tar.bz2 - valgrind-3.9.0-glibc-2.20.patch) + valgrind-3.9.0-glibc-2.21.patch) sha1sums=('15518427de842547ffa84eff8b2b67f3b16581a8' - '2080c3d44de20857f18b03a93404a8f3d3721f7e') + 'f1740a5b03c69baee4aa0cefb27315d6b5ec6699') prepare() { cd $pkgname-$pkgver - patch -p1 -i "$srcdir"/valgrind-3.9.0-glibc-2.20.patch + patch -p1 -i "$srcdir"/valgrind-3.9.0-glibc-2.21.patch } build() { Deleted: valgrind-3.9.0-glibc-2.20.patch =================================================================== --- valgrind-3.9.0-glibc-2.20.patch 2015-02-08 01:50:29 UTC (rev 231117) +++ valgrind-3.9.0-glibc-2.20.patch 2015-02-08 02:19:47 UTC (rev 231118) @@ -1,37 +0,0 @@ -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.20) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.20 family" >&5 -+$as_echo "2.20 family" >&6; } -+ -+$as_echo "#define GLIBC_2_20 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.20) -+ AC_MSG_RESULT(2.20 family) -+ AC_DEFINE([GLIBC_2_20], 1, [Define to 1 if you're using glibc 2.20.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]) Copied: valgrind/trunk/valgrind-3.9.0-glibc-2.21.patch (from rev 231117, valgrind/trunk/valgrind-3.9.0-glibc-2.20.patch) =================================================================== --- valgrind-3.9.0-glibc-2.21.patch (rev 0) +++ valgrind-3.9.0-glibc-2.21.patch 2015-02-08 02:19:47 UTC (rev 231118) @@ -0,0 +1,54 @@ +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,26 @@ + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; ++ 2.20) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.20 family" >&5 ++$as_echo "2.20 family" >&6; } ++ ++$as_echo "#define GLIBC_2_20 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}" ++ ;; ++ 2.21) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.21 family" >&5 ++$as_echo "2.21 family" >&6; } ++ ++$as_echo "#define GLIBC_2_21 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,20 @@ + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; ++ 2.20) ++ AC_MSG_RESULT(2.20 family) ++ AC_DEFINE([GLIBC_2_20], 1, [Define to 1 if you're using glibc 2.20.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}" ++ ;; ++ 2.21) ++ AC_MSG_RESULT(2.21 family) ++ AC_DEFINE([GLIBC_2_21], 1, [Define to 1 if you're using glibc 2.21.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])