valgrind: glibc-2.14 compat (from Arch), avoid openmpi dependency.
This commit is contained in:
parent
1dbbdbe791
commit
cb9b1d33f5
3 changed files with 125 additions and 5 deletions
52
srcpkgs/valgrind/patches/glibc-patch-version.patch
Normal file
52
srcpkgs/valgrind/patches/glibc-patch-version.patch
Normal file
|
@ -0,0 +1,52 @@
|
||||||
|
Saves having to rebuild valgrind on glibc-x.x.* patch level releases
|
||||||
|
|
||||||
|
diff -Naur valgrind-3.5.0-old//glibc-2.X.supp.in valgrind-3.5.0/glibc-2.X.supp.in
|
||||||
|
--- valgrind-3.5.0-old//glibc-2.X.supp.in 2009-08-19 23:37:48.000000000 +1000
|
||||||
|
+++ valgrind-3.5.0/glibc-2.X.supp.in 2010-05-22 19:43:08.088007038 +1000
|
||||||
|
@@ -168,9 +168,9 @@
|
||||||
|
Memcheck:Param
|
||||||
|
socketcall.sendto(msg)
|
||||||
|
fun:__sendto_nocancel
|
||||||
|
- obj:/*libc-@GLIBC_VERSION@.so
|
||||||
|
- obj:/*libc-@GLIBC_VERSION@.so
|
||||||
|
- obj:/*libc-@GLIBC_VERSION@.so
|
||||||
|
+ obj:/*libc-@GLIBC_VERSION@*.so
|
||||||
|
+ obj:/*libc-@GLIBC_VERSION@*.so
|
||||||
|
+ obj:/*libc-@GLIBC_VERSION@*.so
|
||||||
|
}
|
||||||
|
{
|
||||||
|
glibc24-64bit-padding-1c
|
||||||
|
@@ -180,7 +180,7 @@
|
||||||
|
fun:__nscd_get_map_ref
|
||||||
|
fun:nscd_get*_r
|
||||||
|
fun:*nscd*
|
||||||
|
- obj:/*libc-@GLIBC_VERSION@.so
|
||||||
|
+ obj:/*libc-@GLIBC_VERSION@*.so
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -199,18 +199,18 @@
|
||||||
|
Memcheck:Param
|
||||||
|
socketcall.sendto(msg)
|
||||||
|
fun:send
|
||||||
|
- obj:/*libc-@GLIBC_VERSION@.so
|
||||||
|
- obj:/*libc-@GLIBC_VERSION@.so
|
||||||
|
- obj:/*libc-@GLIBC_VERSION@.so
|
||||||
|
+ obj:/*libc-@GLIBC_VERSION@*.so
|
||||||
|
+ obj:/*libc-@GLIBC_VERSION@*.so
|
||||||
|
+ obj:/*libc-@GLIBC_VERSION@*.so
|
||||||
|
}
|
||||||
|
{
|
||||||
|
X11-64bit-padding-4b
|
||||||
|
Memcheck:Param
|
||||||
|
socketcall.send(msg)
|
||||||
|
fun:send
|
||||||
|
- obj:/*libc-@GLIBC_VERSION@.so
|
||||||
|
- obj:/*libc-@GLIBC_VERSION@.so
|
||||||
|
- obj:/*libc-@GLIBC_VERSION@.so
|
||||||
|
+ obj:/*libc-@GLIBC_VERSION@*.so
|
||||||
|
+ obj:/*libc-@GLIBC_VERSION@*.so
|
||||||
|
+ obj:/*libc-@GLIBC_VERSION@*.so
|
||||||
|
}
|
||||||
|
|
||||||
|
##----------------------------------------------------------------------##
|
67
srcpkgs/valgrind/patches/valgrind-3.6.1-glibc-2.14.patch
Normal file
67
srcpkgs/valgrind/patches/valgrind-3.6.1-glibc-2.14.patch
Normal file
|
@ -0,0 +1,67 @@
|
||||||
|
--- valgrind/configure.in.jj 2010-10-21 03:14:02.000000000 +0200
|
||||||
|
+++ valgrind/configure.in 2010-11-05 17:09:18.674455299 +0100
|
||||||
|
@@ -749,6 +759,13 @@ case "${GLIBC_VERSION}" in
|
||||||
|
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
|
||||||
|
DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
|
||||||
|
;;
|
||||||
|
+ 2.14)
|
||||||
|
+ AC_MSG_RESULT(2.14 family)
|
||||||
|
+ AC_DEFINE([GLIBC_2_14], 1, [Define to 1 if you're using glibc 2.14.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}"
|
||||||
|
+ ;;
|
||||||
|
aix5)
|
||||||
|
AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3)
|
||||||
|
AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3])
|
||||||
|
@@ -762,7 +779,7 @@ case "${GLIBC_VERSION}" in
|
||||||
|
|
||||||
|
*)
|
||||||
|
AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
|
||||||
|
- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.13])
|
||||||
|
+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.14])
|
||||||
|
AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION])
|
||||||
|
AC_MSG_ERROR([or Darwin libc])
|
||||||
|
;;
|
||||||
|
--- valgrind/config.h.in.jj 2010-10-20 22:20:49.000000000 +0200
|
||||||
|
+++ valgrind/config.h.in 2010-11-05 17:08:33.863454886 +0100
|
||||||
|
@@ -33,6 +33,9 @@
|
||||||
|
/* Define to 1 if you're using glibc 2.13.x */
|
||||||
|
#undef GLIBC_2_13
|
||||||
|
|
||||||
|
+/* Define to 1 if you're using glibc 2.14.x */
|
||||||
|
+#undef GLIBC_2_14
|
||||||
|
+
|
||||||
|
/* Define to 1 if you're using glibc 2.2.x */
|
||||||
|
#undef GLIBC_2_2
|
||||||
|
|
||||||
|
--- valgrind/configure.jj 2010-10-21 03:16:18.000000000 +0200
|
||||||
|
+++ valgrind/configure 2010-11-05 17:09:39.163455396 +0100
|
||||||
|
@@ -6367,6 +6389,18 @@ $as_echo "#define GLIBC_2_13 1" >>confde
|
||||||
|
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
|
||||||
|
DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
|
||||||
|
;;
|
||||||
|
+ 2.14)
|
||||||
|
+ echo "$as_me:$LINENO: result: 2.14 family" >&5
|
||||||
|
+echo "${ECHO_T}2.14 family" >&6
|
||||||
|
+
|
||||||
|
+cat >>confdefs.h <<\_ACEOF
|
||||||
|
+#define GLIBC_2_14 1
|
||||||
|
+_ACEOF
|
||||||
|
+
|
||||||
|
+ 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}"
|
||||||
|
+ ;;
|
||||||
|
aix5)
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: AIX 5.1 or 5.2 or 5.3" >&5
|
||||||
|
$as_echo "AIX 5.1 or 5.2 or 5.3" >&6; }
|
||||||
|
@@ -6387,7 +6421,7 @@ $as_echo "#define DARWIN_LIBC 1" >>confd
|
||||||
|
*)
|
||||||
|
{ $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.13" "$LINENO" 5
|
||||||
|
+ as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5
|
||||||
|
as_fn_error "or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION" "$LINENO" 5
|
||||||
|
as_fn_error "or Darwin libc" "$LINENO" 5
|
||||||
|
;;
|
|
@ -1,11 +1,15 @@
|
||||||
# Template file for 'valgrind'
|
# Template file for 'valgrind'
|
||||||
pkgname=valgrind
|
pkgname=valgrind
|
||||||
version=3.6.1
|
version=3.6.1
|
||||||
|
revision=1
|
||||||
|
patch_args="-Np1"
|
||||||
distfiles="http://www.valgrind.org/downloads/$pkgname-$version.tar.bz2"
|
distfiles="http://www.valgrind.org/downloads/$pkgname-$version.tar.bz2"
|
||||||
build_style=gnu_configure
|
build_style=gnu_configure
|
||||||
configure_args="--enable-tls"
|
configure_args="--enable-tls --with-mpicc=/dev/null"
|
||||||
short_desc="Tool for finding memory management bugs in programs"
|
short_desc="Tool for finding memory management bugs in programs"
|
||||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||||
|
homepage="http://valgrind.org/"
|
||||||
|
license="GPL-2"
|
||||||
checksum=49bdcc4fbcf060049b5f0dcfd8a187a6e90e0b0e57309f633b64e44430726a0e
|
checksum=49bdcc4fbcf060049b5f0dcfd8a187a6e90e0b0e57309f633b64e44430726a0e
|
||||||
long_desc="
|
long_desc="
|
||||||
Valgrind is a tool to help you find memory-management problems in your
|
Valgrind is a tool to help you find memory-management problems in your
|
||||||
|
@ -15,9 +19,6 @@ long_desc="
|
||||||
detect a lot of problems that are otherwise very hard to find/diagnose."
|
detect a lot of problems that are otherwise very hard to find/diagnose."
|
||||||
|
|
||||||
subpackages="$pkgname-devel"
|
subpackages="$pkgname-devel"
|
||||||
Add_dependency run glibc ">=2.13<2.14"
|
Add_dependency run glibc "<=2.14.[0-9]*"
|
||||||
Add_dependency run openmpi
|
|
||||||
Add_dependency full perl ">=0"
|
Add_dependency full perl ">=0"
|
||||||
Add_dependency build pkg-config
|
Add_dependency build pkg-config
|
||||||
Add_dependency build automake
|
|
||||||
Add_dependency build openmpi-devel
|
|
||||||
|
|
Loading…
Reference in a new issue