Date: Tuesday, January 3, 2012 @ 20:26:04
Author: allan
Revision: 145920
db-move: moved valgrind from [testing] to [extra] (i686)
Added:
valgrind/repos/extra-i686/PKGBUILD
(from rev 145919, valgrind/repos/testing-i686/PKGBUILD)
valgrind/repos/extra-i686/valgrind-3.7.0-glibc-2.15.patch
(from rev 145919,
valgrind/repos/testing-i686/valgrind-3.7.0-glibc-2.15.patch)
Deleted:
valgrind/repos/extra-i686/PKGBUILD
valgrind/repos/testing-i686/
---------------------------------+
PKGBUILD | 68 ++++++++++++++++++++------------------
valgrind-3.7.0-glibc-2.15.patch | 30 ++++++++++++++++
2 files changed, 66 insertions(+), 32 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-01-04 01:25:14 UTC (rev 145919)
+++ extra-i686/PKGBUILD 2012-01-04 01:26:04 UTC (rev 145920)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee <d...@archlinux.org>
-# Maintainer: Allan McRae <al...@archlinux.org>
-
-pkgname=valgrind
-pkgver=3.7.0
-pkgrel=1
-pkgdesc="A tool to help find memory-management problems in programs"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://valgrind.org/";
-depends=('glibc>=2.14' 'glibc<2.15' 'perl')
-makedepends=('gdb')
-options=('!emptydirs')
-source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('a855fda56edf05614f099dca316d1775')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- if [ "${CARCH}" = "x86_64" ]; then
- ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit
- else
- ./configure --prefix=/usr --mandir=/usr/share/man
- fi
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-}
Copied: valgrind/repos/extra-i686/PKGBUILD (from rev 145919,
valgrind/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-01-04 01:26:04 UTC (rev 145920)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Dan McGee <d...@archlinux.org>
+# Maintainer: Allan McRae <al...@archlinux.org>
+
+pkgname=valgrind
+pkgver=3.7.0
+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.15' 'glibc<2.16' 'perl')
+makedepends=('gdb')
+options=('!emptydirs')
+source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
+ valgrind-3.7.0-glibc-2.15.patch)
+md5sums=('a855fda56edf05614f099dca316d1775'
+ 'f534b79b358cdced0319b375aafde4d5')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ patch -Np1 -i ${srcdir}/valgrind-3.7.0-glibc-2.15.patch
+
+ if [ "${CARCH}" = "x86_64" ]; then
+ ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit
+ else
+ ./configure --prefix=/usr --mandir=/usr/share/man
+ fi
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+}
Copied: valgrind/repos/extra-i686/valgrind-3.7.0-glibc-2.15.patch (from rev
145919, valgrind/repos/testing-i686/valgrind-3.7.0-glibc-2.15.patch)
===================================================================
--- extra-i686/valgrind-3.7.0-glibc-2.15.patch (rev 0)
+++ extra-i686/valgrind-3.7.0-glibc-2.15.patch 2012-01-04 01:26:04 UTC (rev
145920)
@@ -0,0 +1,30 @@
+diff -Naur valgrind-3.7.0-orig/configure valgrind-3.7.0/configure
+--- valgrind-3.7.0-orig/configure 2011-11-05 21:24:39.000000000 +1000
++++ valgrind-3.7.0/configure 2011-12-27 15:43:54.832120449 +1000
+@@ -6402,6 +6402,17 @@
+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ ;;
++ 2.15)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.15 family" >&5
++$as_echo "2.15 family" >&6; }
++
++$as_echo "#define GLIBC_2_15 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; }
+@@ -6422,7 +6433,7 @@
+ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version
${GLIBC_VERSION}" >&5
+ $as_echo "unsupported version ${GLIBC_VERSION}" >&6; }
+- as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5
++ as_fn_error "Valgrind requires glibc version 2.2 - 2.15" "$LINENO" 5
+ as_fn_error "or Darwin libc" "$LINENO" 5
+ ;;
+ esac
