From ec692f94984e10593dd154fc340299131b347b0f Mon Sep 17 00:00:00 2001 From: Charles Hardin Date: Thu, 8 Sep 2016 16:42:00 -0700 Subject: [PATCH] jemalloc: add a check for valgrind being configured as well jemalloc can be compiled with valgrind support being enabled to produce proper output, so when the valgrind package has been configured configure jemalloc appropriately. In addition, make sure to disable valgrind support unconditionally in the host variant of jemalloc. Signed-off-by: Charles Hardin Signed-off-by: Thomas Petazzoni --- package/jemalloc/jemalloc.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/jemalloc/jemalloc.mk b/package/jemalloc/jemalloc.mk index 7086dfa9cd..f1c9ffe622 100644 --- a/package/jemalloc/jemalloc.mk +++ b/package/jemalloc/jemalloc.mk @@ -11,5 +11,14 @@ JEMALLOC_LICENSE = BSD-2c JEMALLOC_LICENSE_FILES = COPYING JEMALLOC_INSTALL_STAGING = YES +ifeq ($(BR2_PACKAGE_VALGRIND),y) +JEMALLOC_DEPENDENCIES += valgrind +JEMALLOC_CONF_OPTS += --enable-valgrind +else +JEMALLOC_CONF_OPTS += --disable-valgrind +endif + +HOST_JEMALLOC_CONF_OPTS += --disable-valgrind + $(eval $(autotools-package)) $(eval $(host-autotools-package))