valgrind: sync patches with Arch from upstream subversion repo.
This commit is contained in:
Juan RP
parent
8d42766a40
commit
e3720e2a3d
5 changed files with 117 additions and 49 deletions
|
|
@ -1,10 +0,0 @@
|
|||
--- coregrind/vgdb.c.orig 2013-08-13 11:47:04.267748406 +0200
|
||||
+++ coregrind/vgdb.c 2013-08-13 11:47:11.851818772 +0200
|
||||
@@ -102,7 +102,6 @@ I_die_here : (PTRACEINVOKER) architectur
|
||||
#include <sys/user.h>
|
||||
#if defined(VGO_linux)
|
||||
# include <sys/prctl.h>
|
||||
-# include <linux/ptrace.h>
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
--- configure 2012-09-19 05:19:23.000000000 +1000
|
||||
+++ configure 2012-12-27 08:11:36.645429011 +1000
|
||||
@@ -6612,6 +6612,24 @@
|
||||
|
||||
# DEFAULT_SUPP set by kernel version check above.
|
||||
;;
|
||||
+ 2.1[78]*)
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.17 family" >&5
|
||||
+$as_echo "2.17 family" >&6; }
|
||||
+
|
||||
+$as_echo "#define GLIBC_2_17 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; }
|
||||
+
|
||||
+$as_echo "#define DARWIN_LIBC 1" >>confdefs.h
|
||||
+
|
||||
+ # DEFAULT_SUPP set by kernel version check above.
|
||||
+ ;;
|
||||
bionic)
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Bionic" >&5
|
||||
$as_echo "Bionic" >&6; }
|
||||
@@ -6624,7 +6642,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.16" "$LINENO" 5
|
||||
+ as_fn_error "Valgrind requires glibc version 2.2 - 2.18" "$LINENO" 5
|
||||
as_fn_error "or Darwin libc" "$LINENO" 5
|
||||
;;
|
||||
esac
|
||||
32
srcpkgs/valgrind/patches/valgrind-3.8.1-glibc-2.18.patch
Normal file
32
srcpkgs/valgrind/patches/valgrind-3.8.1-glibc-2.18.patch
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
--- 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
|
||||
|
|
@ -0,0 +1,78 @@
|
|||
Index: coregrind/vgdb.c
|
||||
===================================================================
|
||||
--- coregrind/vgdb.c (revision 13470)
|
||||
+++ coregrind/vgdb.c (revision 13471)
|
||||
@@ -100,11 +100,10 @@
|
||||
|
||||
#if defined(PTRACEINVOKER)
|
||||
#include <sys/user.h>
|
||||
#if defined(VGO_linux)
|
||||
# include <sys/prctl.h>
|
||||
-# include <linux/ptrace.h>
|
||||
#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 <stddef.h>
|
||||
+#include <sys/ptrace.h>
|
||||
+#include <sys/user.h>
|
||||
+]], [[
|
||||
+ 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])
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
# Template file for 'valgrind'
|
||||
pkgname=valgrind
|
||||
version=3.8.1
|
||||
revision=4
|
||||
revision=5
|
||||
only_for_archs="i686 x86_64"
|
||||
build_style=gnu-configure
|
||||
configure_args="--enable-tls --with-mpicc=/dev/null"
|
||||
hostmakedepends="perl pkg-config"
|
||||
hostmakedepends="perl pkg-config automake libtool"
|
||||
short_desc="Tool for finding memory management bugs in programs"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://valgrind.org/"
|
||||
|
|
@ -13,9 +13,13 @@ license="GPL-2"
|
|||
distfiles="http://www.valgrind.org/downloads/${pkgname}-${version}.tar.bz2"
|
||||
checksum=473be00576bed311a662b277a2bfbe97d9cca4058e68619a0e420c9fc19958db
|
||||
|
||||
pre_configure() {
|
||||
./autogen.sh
|
||||
}
|
||||
|
||||
valgrind-devel_package() {
|
||||
depends="valgrind>=${version}"
|
||||
short_desc+=" -- development files"
|
||||
short_desc+=" - development files"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
vmove usr/lib/pkgconfig
|
||||
|
|
|
|||
Loading…
Reference in a new issue