Date: Saturday, November 29, 2014 @ 06:54:22 Author: lcarlier Revision: 123279
archrelease: copy trunk to multilib-x86_64 Added: valgrind-multilib/repos/multilib-x86_64/PKGBUILD (from rev 123278, valgrind-multilib/trunk/PKGBUILD) valgrind-multilib/repos/multilib-x86_64/valgrind-3.9.0-glibc-2.20.patch (from rev 123278, valgrind-multilib/trunk/valgrind-3.9.0-glibc-2.20.patch) Deleted: valgrind-multilib/repos/multilib-x86_64/PKGBUILD valgrind-multilib/repos/multilib-x86_64/valgrind-3.9.0-glibc-2.20.patch ---------------------------------+ PKGBUILD | 76 +++++++++++++++++++------------------- valgrind-3.9.0-glibc-2.20.patch | 74 ++++++++++++++++++------------------- 2 files changed, 75 insertions(+), 75 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2014-11-29 05:54:09 UTC (rev 123278) +++ PKGBUILD 2014-11-29 05:54:22 UTC (rev 123279) @@ -1,38 +0,0 @@ -# $Id$ -# Contributor: Dan McGee <d...@archlinux.org> -# Contributor: Allan McRae <al...@archlinux.org> - -pkgname=valgrind-multilib -pkgver=3.10.0 -pkgrel=1 -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.20' 'lib32-glibc<2.21' 'perl') -makedepends=('gdb' 'openmpi' 'gcc-multilib') -optdepends=('openmpi: MPI support') -options=('staticlibs' '!emptydirs') -source=(http://valgrind.org/downloads/valgrind-$pkgver.tar.bz2 - valgrind-3.9.0-glibc-2.20.patch) -sha1sums=('aec0b8cd042ec36c8cce4f6027b98627ab202f26' - '2080c3d44de20857f18b03a93404a8f3d3721f7e') - -provides=('valgrind') -conflicts=('valgrind') - -prepare() { - cd valgrind-$pkgver - patch -p1 -i "$srcdir"/valgrind-3.9.0-glibc-2.20.patch -} - -build() { - cd valgrind-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man --with-mpicc=mpicc - make -} - -package() { - cd valgrind-$pkgver - make DESTDIR="$pkgdir" install -} Copied: valgrind-multilib/repos/multilib-x86_64/PKGBUILD (from rev 123278, valgrind-multilib/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2014-11-29 05:54:22 UTC (rev 123279) @@ -0,0 +1,38 @@ +# $Id$ +# Contributor: Dan McGee <d...@archlinux.org> +# Contributor: Allan McRae <al...@archlinux.org> + +pkgname=valgrind-multilib +pkgver=3.10.1 +pkgrel=1 +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.20' 'lib32-glibc<2.21' 'perl') +makedepends=('gdb' 'openmpi' 'gcc-multilib') +optdepends=('openmpi: MPI support') +options=('staticlibs' '!emptydirs') +source=(http://valgrind.org/downloads/valgrind-$pkgver.tar.bz2 + valgrind-3.9.0-glibc-2.20.patch) +sha1sums=('15518427de842547ffa84eff8b2b67f3b16581a8' + '2080c3d44de20857f18b03a93404a8f3d3721f7e') + +provides=('valgrind') +conflicts=('valgrind') + +prepare() { + cd valgrind-$pkgver + patch -p1 -i "$srcdir"/valgrind-3.9.0-glibc-2.20.patch +} + +build() { + cd valgrind-$pkgver + ./configure --prefix=/usr --mandir=/usr/share/man --with-mpicc=mpicc + make +} + +package() { + cd valgrind-$pkgver + make DESTDIR="$pkgdir" install +} Deleted: valgrind-3.9.0-glibc-2.20.patch =================================================================== --- valgrind-3.9.0-glibc-2.20.patch 2014-11-29 05:54:09 UTC (rev 123278) +++ valgrind-3.9.0-glibc-2.20.patch 2014-11-29 05:54:22 UTC (rev 123279) @@ -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-multilib/repos/multilib-x86_64/valgrind-3.9.0-glibc-2.20.patch (from rev 123278, valgrind-multilib/trunk/valgrind-3.9.0-glibc-2.20.patch) =================================================================== --- valgrind-3.9.0-glibc-2.20.patch (rev 0) +++ valgrind-3.9.0-glibc-2.20.patch 2014-11-29 05:54:22 UTC (rev 123279) @@ -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.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])