diff options
Diffstat (limited to 'package/valgrind')
| -rw-r--r-- | package/valgrind/Config.in | 8 | ||||
| -rw-r--r-- | package/valgrind/Makefile | 21 | ||||
| -rw-r--r-- | package/valgrind/patches/patch-configure | 27 |
3 files changed, 29 insertions, 27 deletions
diff --git a/package/valgrind/Config.in b/package/valgrind/Config.in deleted file mode 100644 index dbb743a1c..000000000 --- a/package/valgrind/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config ADK_PACKAGE_VALGRIND - prompt "valgrind.......................... a memory error detector and more" - tristate - default n - depends on ADK_LINUX_X86_ALIX1C || \ - ADK_LINUX_X86_QEMU - help - http://valgrind.org/ diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile index 7c87147ed..a7dfe2886 100644 --- a/package/valgrind/Makefile +++ b/package/valgrind/Makefile @@ -4,32 +4,33 @@ include $(TOPDIR)/rules.mk PKG_NAME:= valgrind -PKG_VERSION:= 3.3.1 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 0539e2fa4aadb2cd4ca4bba65b1fe8b5 +PKG_VERSION:= 3.5.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= f03522a4687cf76c676c9494fcc0a517 PKG_DESCR:= memory management debugging PKG_SECTION:= utils PKG_URL:= http://valgrind.org PKG_SITES:= http://valgrind.org/downloads/ +PKG_TARGET_DEPENDS:= x86 x86_64 + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,VALGRIND,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu +CONFIGURE_ENV+= ac_cv_file__proc_self_fd=yes \ + ac_cv_file__proc_self_exe=yes \ + ac_cv_file__proc_self_maps=yes CONFIGURE_ARGS+= --disable-tls -BUILD_STYLE= auto -INSTALL_STYLE= auto post-install: $(INSTALL_DIR) $(IDIR_VALGRIND)/usr/bin - $(INSTALL_DIR) $(IDIR_VALGRIND)/usr/lib/valgrind/${ARCH}-linux + $(INSTALL_DIR) $(IDIR_VALGRIND)/usr/lib/valgrind $(INSTALL_BIN) $(WRKINST)/usr/bin/valgrind $(IDIR_VALGRIND)/usr/bin/ - $(CP) $(WRKINST)/usr/lib/valgrind/${ARCH}-linux/* \ - $(IDIR_VALGRIND)/usr/lib/valgrind/${ARCH}-linux - rm $(IDIR_VALGRIND)/usr/lib/valgrind/${ARCH}-linux/*.a + $(CP) $(WRKINST)/usr/lib/valgrind/* \ + $(IDIR_VALGRIND)/usr/lib/valgrind touch $(IDIR_VALGRIND)/usr/lib/valgrind/default.supp include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/valgrind/patches/patch-configure b/package/valgrind/patches/patch-configure index 07bea76d5..9867b5309 100644 --- a/package/valgrind/patches/patch-configure +++ b/package/valgrind/patches/patch-configure @@ -1,6 +1,15 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- valgrind-3.3.1.orig/configure 2008-06-01 03:44:42.000000000 +0200 -+++ valgrind-3.3.1/configure 2009-06-02 01:32:59.000000000 +0200 ++++ valgrind-3.3.1/configure 2009-12-12 00:28:43.000000000 +0100 +@@ -4129,7 +4129,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.32 + + case "${kernel}" in + 2.6.*) @@ -4637,6 +4637,27 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>& fi rm -f conftest* @@ -14,15 +23,15 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ + +#include <features.h> +#ifdef __GNU_LIBRARY__ -+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 10) -+ GLIBC_210 ++ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 11) ++ GLIBC_211 + #endif +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "GLIBC_210" >/dev/null 2>&1; then -+ libc="2.10" ++ $EGREP "GLIBC_211" >/dev/null 2>&1; then ++ libc="2.11" +fi +rm -f conftest* + @@ -33,12 +42,12 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ DEFAULT_SUPP="glibc-2.8.supp ${DEFAULT_SUPP}" DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ;; -+ 2.10) -+ echo "$as_me:$LINENO: result: 2.10 family" >&5 -+echo "${ECHO_T}2.10 family" >&6 ++ 2.11) ++ echo "$as_me:$LINENO: result: 2.11 family" >&5 ++echo "${ECHO_T}2.11 family" >&6 + +cat >>confdefs.h <<\_ACEOF -+#define GLIBC_2_10 1 ++#define GLIBC_2_11 1 +_ACEOF + + DEFAULT_SUPP="glibc-2.8.supp ${DEFAULT_SUPP}" |