From 15d471d14d84fdaa6b9d2853bae4716561261b7e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 2 Nov 2013 08:58:13 +0100 Subject: [PATCH] valgrind: update to 2.9.0. --- .../patches/valgrind-3.8.1-glibc-2.18.patch | 32 -------- .../valgrind-3.8.1-ptrace-build-fix.patch | 78 ------------------- srcpkgs/valgrind/template | 15 ++-- 3 files changed, 6 insertions(+), 119 deletions(-) delete mode 100644 srcpkgs/valgrind/patches/valgrind-3.8.1-glibc-2.18.patch delete mode 100644 srcpkgs/valgrind/patches/valgrind-3.8.1-ptrace-build-fix.patch diff --git a/srcpkgs/valgrind/patches/valgrind-3.8.1-glibc-2.18.patch b/srcpkgs/valgrind/patches/valgrind-3.8.1-glibc-2.18.patch deleted file mode 100644 index d5e5c3cc640..00000000000 --- a/srcpkgs/valgrind/patches/valgrind-3.8.1-glibc-2.18.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- configure.in 2013-08-13 22:36:20.201676976 +1000 -+++ configure.in 2013-08-13 22:38:18.402750093 +1000 -@@ -906,6 +906,20 @@ - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.17) -+ AC_MSG_RESULT(2.17 family) -+ AC_DEFINE([GLIBC_2_17], 1, [Define to 1 if you're using glibc 2.17.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.18) -+ AC_MSG_RESULT(2.18 family) -+ AC_DEFINE([GLIBC_2_18], 1, [Define to 1 if you're using glibc 2.18.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]) -@@ -919,7 +933,7 @@ - - *) - AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) -- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.16]) -+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.18]) - AC_MSG_ERROR([or Darwin libc]) - ;; - esac diff --git a/srcpkgs/valgrind/patches/valgrind-3.8.1-ptrace-build-fix.patch b/srcpkgs/valgrind/patches/valgrind-3.8.1-ptrace-build-fix.patch deleted file mode 100644 index 89af000b12a..00000000000 --- a/srcpkgs/valgrind/patches/valgrind-3.8.1-ptrace-build-fix.patch +++ /dev/null @@ -1,78 +0,0 @@ -Index: coregrind/vgdb.c -=================================================================== ---- coregrind/vgdb.c (revision 13470) -+++ coregrind/vgdb.c (revision 13471) -@@ -100,11 +100,10 @@ - - #if defined(PTRACEINVOKER) - #include - #if defined(VGO_linux) - # include --# include - #endif - #endif - - - // Outputs information for the user about ptrace not working. - -Index: coregrind/vgdb.c -=================================================================== ---- coregrind/vgdb.c (revision 13481) -+++ coregrind/vgdb.c (revision 13482) -@@ -691,7 +691,7 @@ - // runtime check not yet done. - // 0 : PTRACE_GETREGS runtime check has failed. - // 1 : PTRACE_GETREGS defined and runtime check ok. --#ifdef PTRACE_GETREGS -+#ifdef HAVE_PTRACE_GETREGS - static int has_working_ptrace_getregs = -1; - #endif - -@@ -702,7 +702,7 @@ - Bool getregs (int pid, void *regs, long regs_bsz) - { - DEBUG(1, "getregs regs_bsz %ld\n", regs_bsz); --# ifdef PTRACE_GETREGS -+# ifdef HAVE_PTRACE_GETREGS - if (has_working_ptrace_getregs) { - // Platforms having GETREGS - long res; -@@ -773,7 +773,7 @@ - DEBUG(1, "setregs regs_bsz %ld\n", regs_bsz); - // Note : the below is checking for GETREGS, not SETREGS - // as if one is defined and working, the other one should also work. --# ifdef PTRACE_GETREGS -+# ifdef HAVE_PTRACE_GETREGS - if (has_working_ptrace_getregs) { - // Platforms having SETREGS - long res; -Index: configure.in -=================================================================== ---- configure.in (revision 13481) -+++ configure.in (revision 13482) -@@ -1040,6 +1040,25 @@ - - AM_CONDITIONAL([HAVE_GNU_STPNCPY], [test x$ac_have_gnu_stpncpy = xyes]) - -+# Check for PTRACE_GETREGS -+ -+AC_MSG_CHECKING([for PTRACE_GETREGS]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -+#include -+#include -+#include -+]], [[ -+ void *p; -+ long res = ptrace (PTRACE_GETREGS, 0, p, p); -+]])], [ -+AC_MSG_RESULT([yes]) -+AC_DEFINE([HAVE_PTRACE_GETREGS], 1, -+ [Define to 1 if you have the `PTRACE_GETREGS' ptrace request.]) -+], [ -+AC_MSG_RESULT([no]) -+]) -+ -+ - # Check for CLOCK_MONOTONIC - - AC_MSG_CHECKING([for CLOCK_MONOTONIC]) diff --git a/srcpkgs/valgrind/template b/srcpkgs/valgrind/template index 70c4acc305b..8cb24c8f94f 100644 --- a/srcpkgs/valgrind/template +++ b/srcpkgs/valgrind/template @@ -1,21 +1,18 @@ # Template file for 'valgrind' pkgname=valgrind -version=3.8.1 -revision=5 +version=3.9.0 +revision=1 only_for_archs="i686 x86_64" build_style=gnu-configure configure_args="--enable-tls --with-mpicc=/dev/null" -hostmakedepends="perl pkg-config automake libtool" +hostmakedepends="perl pkg-config" +makedepends="libgomp-devel" short_desc="Tool for finding memory management bugs in programs" maintainer="Juan RP " homepage="http://valgrind.org/" license="GPL-2" distfiles="http://www.valgrind.org/downloads/${pkgname}-${version}.tar.bz2" -checksum=473be00576bed311a662b277a2bfbe97d9cca4058e68619a0e420c9fc19958db - -pre_configure() { - ./autogen.sh -} +checksum=e6af71a06bc2534541b07743e1d58dc3caf744f38205ca3e5b5a0bdf372ed6f0 valgrind-devel_package() { depends="valgrind>=${version}" @@ -31,6 +28,6 @@ valgrind-devel_package() { valgrind_package() { depends="perl glibc>=2.18<2.19 glibc-dbg>=2.18<2.19" pkg_install() { - vmove usr + vmove all } }