X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fdevel%2Fvalgrind%2FMakefile;h=0c5b0cffd45cc6a1aeae2cd5cff899d283f94dec;hb=a489f72ab561d0c325621cd878433a0149850e25;hp=a55fb40d804643862b7381982caf6d7d9d5e7670;hpb=8d3f3a1d7214f658a0d0132a62b8943ae100efbd;p=openwrt%2Fstaging%2Fdedeckeh.git

diff --git a/package/devel/valgrind/Makefile b/package/devel/valgrind/Makefile
index a55fb40d80..0c5b0cffd4 100644
--- a/package/devel/valgrind/Makefile
+++ b/package/devel/valgrind/Makefile
@@ -8,19 +8,22 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=valgrind
-PKG_VERSION:=3.8.1
+PKG_VERSION:=3.15.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://valgrind.org/downloads/
-PKG_MD5SUM:=288758010b271119a0ffc0183f1d6e38
+PKG_SOURCE_URL:=http://sourceware.org/pub/valgrind/
+PKG_HASH:=417c7a9da8f60dd05698b3a7bc6002e4ef996f14c13f0ff96679a16873e78ab1
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
+PKG_LICENSE:=GPL-2.0+
+PKG_CPE_ID:=cpe:/a:valgrind:valgrind
 
 PKG_FIXUP = autoreconf
 PKG_INSTALL := 1
 PKG_BUILD_PARALLEL := 1
 PKG_USE_MIPS16:=0
+PKG_SSP:=0
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/kernel.mk
@@ -77,12 +80,14 @@ define Package/valgrind/description
 	to speed up and reduce memory use of your programs.
 endef
 
-CPU := $(patsubst x86_64,amd64,$(patsubst x86,i386,$(LINUX_KARCH)))
+CPU := $(patsubst x86_64,amd64,$(patsubst x86,i386,$(patsubst um,$(ARCH),$(LINUX_KARCH))))
 
 CONFIGURE_VARS += \
 	UNAME_R=$(LINUX_VERSION)
 
-ifeq ($(ARCH),x86_64)
+ifeq ($(CONFIG_ARCH_64BIT),y)
+	CONFIGURE_ARGS += \
+		--enable-only64bit
 	BITS := 64bit
 else
 	CONFIGURE_ARGS += \
@@ -93,11 +98,13 @@ endif
 CONFIGURE_ARGS += \
 	--enable-tls \
 	--without-x \
+	--without-mpicc \
 	--without-uiout \
 	--disable-valgrindmi \
 	--disable-tui \
 	--disable-valgrindtk \
-	--without-included-gettext
+	--without-included-gettext \
+	--with-pagesize=4 \
 
 define Package/valgrind/install	
 	$(INSTALL_DIR) $(1)/usr/bin
@@ -107,12 +114,17 @@ define Package/valgrind/install
 		./files/default.supp \
 		$(PKG_INSTALL_DIR)/usr/lib/valgrind/none-* \
 		$(PKG_INSTALL_DIR)/usr/lib/valgrind/vgpreload_core*.so \
-		$(PKG_INSTALL_DIR)/usr/lib/valgrind/$(CPU)-*.xml \
 		$(PKG_INSTALL_DIR)/usr/lib/valgrind/$(BITS)-core*.xml \
 		$(PKG_INSTALL_DIR)/usr/lib/valgrind/$(BITS)-linux*.xml \
 		$(PKG_INSTALL_DIR)/usr/lib/valgrind/memcheck-* \
 		$(PKG_INSTALL_DIR)/usr/lib/valgrind/vgpreload_memcheck*.so \
 		$(1)/usr/lib/valgrind/
+
+ifneq ($(ARCH),aarch64)
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/valgrind/$(CPU)-*.xml \
+		$(1)/usr/lib/valgrind/
+endif
 endef
 
 define Package/valgrind-cachegrind/install