aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-02-10 20:11:22 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2018-02-10 20:17:43 +0100
commitd0d37e89afd1172874e0c587278bdfe38d16cbe4 (patch)
tree0f5db2109469ada43a34d140f6e3af92435ed4ac
parentb6d6e3fdf117710c1753d280dd3040e745f37786 (diff)
downloadupstream-d0d37e89afd1172874e0c587278bdfe38d16cbe4.tar.gz
upstream-d0d37e89afd1172874e0c587278bdfe38d16cbe4.tar.bz2
upstream-d0d37e89afd1172874e0c587278bdfe38d16cbe4.zip
valgrind: Fix compile on ARM64
Activate the support for 64 bit on all 64 bit CPUs and not only x86_64. ARM64 does not provide an xml file, so do not pack any. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--package/devel/valgrind/Makefile9
1 files changed, 7 insertions, 2 deletions
diff --git a/package/devel/valgrind/Makefile b/package/devel/valgrind/Makefile
index 6be2f9ec1a..dd300b6d9f 100644
--- a/package/devel/valgrind/Makefile
+++ b/package/devel/valgrind/Makefile
@@ -85,7 +85,7 @@ CPU := $(patsubst x86_64,amd64,$(patsubst x86,i386,$(patsubst um,$(ARCH),$(LINUX
CONFIGURE_VARS += \
UNAME_R=$(LINUX_VERSION)
-ifeq ($(ARCH),x86_64)
+ifeq ($(CONFIG_ARCH_64BIT),y)
CONFIGURE_ARGS += \
--enable-only64bit
BITS := 64bit
@@ -114,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