[arch-commits] Commit in valgrind-multilib/trunk (4 files)
Jan Steffens
heftig at archlinux.org
Fri Aug 7 14:16:16 UTC 2015
Date: Friday, August 7, 2015 @ 16:16:16
Author: heftig
Revision: 138061
glibc 2.22
Added:
valgrind-multilib/trunk/valgrind-glibc.patch
valgrind-multilib/trunk/valgrind-kernel-version.patch
Modified:
valgrind-multilib/trunk/PKGBUILD
Deleted:
valgrind-multilib/trunk/valgrind-3.9.0-glibc-2.21.patch
---------------------------------+
PKGBUILD | 17 +++++----
valgrind-3.9.0-glibc-2.21.patch | 54 -----------------------------
valgrind-glibc.patch | 69 ++++++++++++++++++++++++++++++++++++++
valgrind-kernel-version.patch | 47 +++++++++++++++++++++++++
4 files changed, 126 insertions(+), 61 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-08-07 14:12:05 UTC (rev 138060)
+++ PKGBUILD 2015-08-07 14:16:16 UTC (rev 138061)
@@ -4,19 +4,21 @@
pkgname=valgrind-multilib
pkgver=3.10.1
-pkgrel=2.1
-pkgdesc="A tool to help find memory-management problems in programs for multilib"
+pkgrel=3
+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.21' 'lib32-glibc<2.22' 'perl')
+depends=('lib32-glibc>=2.22' 'lib32-glibc<2.23' 'perl')
makedepends=('gdb' 'openmpi' 'gcc-multilib')
optdepends=('openmpi: MPI support')
-options=('staticlibs' '!emptydirs')
+options=('!emptydirs')
source=(http://valgrind.org/downloads/valgrind-$pkgver.tar.bz2
- valgrind-3.9.0-glibc-2.21.patch)
+ valgrind-glibc.patch
+ valgrind-kernel-version.patch)
sha1sums=('15518427de842547ffa84eff8b2b67f3b16581a8'
- 'f1740a5b03c69baee4aa0cefb27315d6b5ec6699')
+ '1fa127ef24630ad5f4901ea0e37ea2acb12d3d17'
+ '08b71e1ebc3e3906d0ff273db0aba2177a857c47')
provides=("valgrind=$pkgver-$pkgrel")
conflicts=('valgrind')
@@ -23,7 +25,8 @@
prepare() {
cd valgrind-$pkgver
- patch -p1 -i "$srcdir"/valgrind-3.9.0-glibc-2.21.patch
+ patch -p1 -i "$srcdir"/valgrind-glibc.patch
+ patch -p1 -i "$srcdir"/valgrind-kernel-version.patch
}
build() {
Deleted: valgrind-3.9.0-glibc-2.21.patch
===================================================================
--- valgrind-3.9.0-glibc-2.21.patch 2015-08-07 14:12:05 UTC (rev 138060)
+++ valgrind-3.9.0-glibc-2.21.patch 2015-08-07 14:16:16 UTC (rev 138061)
@@ -1,54 +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,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])
Added: valgrind-glibc.patch
===================================================================
--- valgrind-glibc.patch (rev 0)
+++ valgrind-glibc.patch 2015-08-07 14:16:16 UTC (rev 138061)
@@ -0,0 +1,69 @@
+From 8e520f21445e7c376c2606826affb20be92bfe8d Mon Sep 17 00:00:00 2001
+From: Anatol Pomozov <anatol.pomozov at gmail.com>
+Date: Thu, 6 Aug 2015 09:04:44 -0700
+Subject: [PATCH 1/2] glibc
+
+---
+ configure | 20 ++++++++++++++++++++
+ configure.ac | 14 ++++++++++++++
+ 2 files changed, 34 insertions(+)
+
+diff --git a/configure b/configure
+index 78ddf3e..6ab06b3 100755
+--- a/configure
++++ b/configure
+@@ -6842,6 +6842,26 @@ $as_echo "#define GLIBC_2_20 1" >>confdefs.h
+ 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}"
++ ;;
++ 2.22)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.22 family" >&5
++$as_echo "2.22 family" >&6; }
++
++$as_echo "#define GLIBC_2_22 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 --git a/configure.ac b/configure.ac
+index 0fd2a41..7f389c2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1018,6 +1018,20 @@ case "${GLIBC_VERSION}" in
+ 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}"
++ ;;
++ 2.22)
++ AC_MSG_RESULT(2.22 family)
++ AC_DEFINE([GLIBC_2_22], 1, [Define to 1 if you're using glibc 2.22.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])
+--
+2.5.0
+
Added: valgrind-kernel-version.patch
===================================================================
--- valgrind-kernel-version.patch (rev 0)
+++ valgrind-kernel-version.patch 2015-08-07 14:16:16 UTC (rev 138061)
@@ -0,0 +1,47 @@
+From 88d02c44361bf4d9b354eea7e20559a4a57b866f Mon Sep 17 00:00:00 2001
+From: Anatol Pomozov <anatol.pomozov at gmail.com>
+Date: Thu, 6 Aug 2015 09:06:25 -0700
+Subject: [PATCH 2/2] kernel
+
+---
+ configure | 6 +++---
+ configure.ac | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/configure b/configure
+index 6ab06b3..a59ef12 100755
+--- a/configure
++++ b/configure
+@@ -5553,9 +5553,9 @@ $as_echo_n "checking for the kernel version... " >&6; }
+ kernel=`uname -r`
+
+ case "${kernel}" in
+- 2.6.*|3.*)
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.6.x/3.x family (${kernel})" >&5
+-$as_echo "2.6.x/3.x family (${kernel})" >&6; }
++ 2.6.*|3.*|4.*)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.6.x/3.x/4.x family (${kernel})" >&5
++$as_echo "2.6.x/3.x/4.x family (${kernel})" >&6; }
+
+ $as_echo "#define KERNEL_2_6 1" >>confdefs.h
+
+diff --git a/configure.ac b/configure.ac
+index 7f389c2..b0bb449 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -303,9 +303,9 @@ case "${host_os}" in
+ kernel=`uname -r`
+
+ case "${kernel}" in
+- 2.6.*|3.*)
+- AC_MSG_RESULT([2.6.x/3.x family (${kernel})])
+- AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x or Linux 3.x])
++ 2.6.*|3.*|4.*)
++ AC_MSG_RESULT([2.6.x/3.x/4.x family (${kernel})])
++ AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x or Linux 3.x or Linux 4.x])
+ ;;
+
+ 2.4.*)
+--
+2.5.0
+
More information about the arch-commits
mailing list