From 6c8d9ddc36b7deeda80a92d4635e99cd4bc85a41 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 2 Feb 2011 21:58:13 +0100 Subject: update to latest upstream version, no patches required, seems to be added upstream. --- package/valgrind/Makefile | 6 +- .../patches/patch-auxprogs_valgrind-listener_c | 29 ----- package/valgrind/patches/patch-configure | 126 --------------------- .../patches/patch-coregrind_launcher-linux_c | 29 ----- 4 files changed, 3 insertions(+), 187 deletions(-) delete mode 100644 package/valgrind/patches/patch-auxprogs_valgrind-listener_c delete mode 100644 package/valgrind/patches/patch-configure delete mode 100644 package/valgrind/patches/patch-coregrind_launcher-linux_c (limited to 'package/valgrind') diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile index abf6f5a47..5940b1afe 100644 --- a/package/valgrind/Makefile +++ b/package/valgrind/Makefile @@ -4,15 +4,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= valgrind -PKG_VERSION:= 3.5.0 +PKG_VERSION:= 3.6.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= f03522a4687cf76c676c9494fcc0a517 +PKG_MD5SUM:= b289c5f4ab8e39741602445f1dd09b34 PKG_DESCR:= memory management debugging PKG_SECTION:= debug PKG_URL:= http://valgrind.org/ PKG_SITES:= http://valgrind.org/downloads/ -PKG_ARCH_DEPENDS:= x86 x86_64 +PKG_ARCH_DEPENDS:= x86 x86_64 native PKG_HOST_DEPENDS:= !darwin DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/valgrind/patches/patch-auxprogs_valgrind-listener_c b/package/valgrind/patches/patch-auxprogs_valgrind-listener_c deleted file mode 100644 index be4b433ed..000000000 --- a/package/valgrind/patches/patch-auxprogs_valgrind-listener_c +++ /dev/null @@ -1,29 +0,0 @@ - try to avoid problems with a pre #defined st_atime here, too ---- valgrind-3.5.0.orig/auxprogs/valgrind-listener.c 2009-08-19 15:37:30.000000000 +0200 -+++ valgrind-3.5.0/auxprogs/valgrind-listener.c 2010-12-30 17:23:49.807262269 +0100 -@@ -32,6 +32,12 @@ - - /*---------------------------------------------------------------*/ - -+#include "pub_core_basics.h" -+#include "pub_core_libcassert.h" // For VG_BUGS_TO -+#include "pub_core_vki.h" // Avoids warnings from -+ // pub_core_libcfile.h -+#include "pub_core_libcfile.h" // For VG_CLO_DEFAULT_LOGPORT -+ - #include - #include - #include -@@ -44,12 +50,6 @@ - #include - #include - --#include "pub_core_basics.h" --#include "pub_core_libcassert.h" // For VG_BUGS_TO --#include "pub_core_vki.h" // Avoids warnings from -- // pub_core_libcfile.h --#include "pub_core_libcfile.h" // For VG_CLO_DEFAULT_LOGPORT -- - - /*---------------------------------------------------------------*/ - diff --git a/package/valgrind/patches/patch-configure b/package/valgrind/patches/patch-configure deleted file mode 100644 index 8c2df9ad5..000000000 --- a/package/valgrind/patches/patch-configure +++ /dev/null @@ -1,126 +0,0 @@ ---- valgrind-3.5.0.orig/configure 2009-08-19 15:44:07.000000000 +0200 -+++ valgrind-3.5.0/configure 2011-01-21 23:59:05.014913852 +0100 -@@ -1819,7 +1819,6 @@ fi - #---------------------------------------------------------------------------- - # Checks for various programs. - #---------------------------------------------------------------------------- --CFLAGS="-Wno-long-long" - - echo "$as_me:$LINENO: checking whether ln -s works" >&5 - echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 -@@ -2429,7 +2428,6 @@ echo "${ECHO_T}$ac_cv_c_compiler_gnu" >& - GCC=`test $ac_compiler_gnu = yes && echo yes` - ac_test_CFLAGS=${CFLAGS+set} - ac_save_CFLAGS=$CFLAGS --CFLAGS="-g" - echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 - echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 - if test "${ac_cv_prog_cc_g+set}" = set; then -@@ -2481,23 +2479,6 @@ ac_cv_prog_cc_g=no - fi - rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 --if test "$ac_test_CFLAGS" = set; then -- CFLAGS=$ac_save_CFLAGS --elif test $ac_cv_prog_cc_g = yes; then -- if test "$GCC" = yes; then -- CFLAGS="-g -O2" -- else -- CFLAGS="-g" -- fi --else -- if test "$GCC" = yes; then -- CFLAGS="-O2" -- else -- CFLAGS= -- fi --fi - echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 - echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 - if test "${ac_cv_prog_cc_stdc+set}" = set; then -@@ -4215,7 +4196,7 @@ echo "${ECHO_T}ok (${host_os})" >&6 - echo "$as_me:$LINENO: checking for the kernel version" >&5 - echo $ECHO_N "checking for the kernel version... $ECHO_C" >&6 - -- kernel=`uname -r` -+ kernel=2.6.33 - - case "${kernel}" in - 2.6.*) -@@ -4841,6 +4822,27 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>& - fi - rm -f conftest* - -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+#include -+#ifdef __GNU_LIBRARY__ -+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 12) -+ GLIBC_212 -+ #endif -+#endif -+ -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "GLIBC_212" >/dev/null 2>&1; then -+ libc="2.12" -+fi -+rm -f conftest* -+ - - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -5005,15 +5007,15 @@ cat >>conftest.$ac_ext <<_ACEOF - - #include - #ifdef __GNU_LIBRARY__ -- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 10) -- GLIBC_210 -+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 12) -+ GLIBC_212 - #endif - #endif - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "GLIBC_210" >/dev/null 2>&1; then -- GLIBC_VERSION="2.10" -+ $EGREP "GLIBC_212" >/dev/null 2>&1; then -+ GLIBC_VERSION="2.12" - fi - rm -f conftest* - -@@ -5174,6 +5176,17 @@ _ACEOF - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.12*) -+ echo "$as_me:$LINENO: result: 2.12 family" >&5 -+echo "${ECHO_T}2.12 family" >&6 -+ -+cat >>confdefs.h <<\_ACEOF -+#define GLIBC_2_12 1 -+_ACEOF -+ -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ ;; - aix5) - echo "$as_me:$LINENO: result: AIX 5.1 or 5.2 or 5.3" >&5 - echo "${ECHO_T}AIX 5.1 or 5.2 or 5.3" >&6 -@@ -5198,7 +5211,7 @@ _ACEOF - *) - echo "$as_me:$LINENO: result: unsupported version" >&5 - echo "${ECHO_T}unsupported version" >&6 -- { { echo "$as_me:$LINENO: error: Valgrind requires glibc version 2.2 - 2.10" >&5 -+ { { echo "$as_me:$LINENO: error: Valgrind requires glibc version 2.2 - 2.11.1" >&5 - echo "$as_me: error: Valgrind requires glibc version 2.2 - 2.10" >&2;} - { (exit 1); exit 1; }; } - { { echo "$as_me:$LINENO: error: or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION" >&5 diff --git a/package/valgrind/patches/patch-coregrind_launcher-linux_c b/package/valgrind/patches/patch-coregrind_launcher-linux_c deleted file mode 100644 index e94ffd908..000000000 --- a/package/valgrind/patches/patch-coregrind_launcher-linux_c +++ /dev/null @@ -1,29 +0,0 @@ - try to avoid errors regarding already #defined st_atime in bits/stat.h or so ---- valgrind-3.5.0.orig/coregrind/launcher-linux.c 2009-08-19 15:37:47.000000000 +0200 -+++ valgrind-3.5.0/coregrind/launcher-linux.c 2010-12-30 17:08:00.035938916 +0100 -@@ -32,6 +32,12 @@ - and so it doesn't have to conform to Valgrind's arcane rules on - no-glibc-usage etc. */ - -+#include "pub_core_debuglog.h" -+#include "pub_core_vki.h" // Avoids warnings from -+ // pub_core_libcfile.h -+#include "pub_core_libcproc.h" // For VALGRIND_LIB, VALGRIND_LAUNCHER -+#include "pub_core_ume.h" -+ - #include - #include - #include -@@ -45,12 +51,6 @@ - #include - #include - --#include "pub_core_debuglog.h" --#include "pub_core_vki.h" // Avoids warnings from -- // pub_core_libcfile.h --#include "pub_core_libcproc.h" // For VALGRIND_LIB, VALGRIND_LAUNCHER --#include "pub_core_ume.h" -- - - - #define PATH_MAX 4096 /* POSIX refers to this a lot but I dunno -- cgit v1.2.3