aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2018-03-29 15:58:14 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2018-03-29 21:19:54 +0200
commitae7d59eaae1c55d707b2a70437a84c280f598572 (patch)
tree9ec0720d25b94c8ee3ac8148e7958888ef8fefe1
parent22e27da26590adb203ad2cb14e986ff5c2592727 (diff)
downloadbuildroot-ae7d59eaae1c55d707b2a70437a84c280f598572.tar.gz
buildroot-ae7d59eaae1c55d707b2a70437a84c280f598572.tar.bz2
sngrep: fix libgcrypt handling
Fixes: http://autobuild.buildroot.net/results/f1c6494133806b9fc26ae3ce9e9c6a22fa2eda6f/ Commit 6205b75873c (sngrep: gnutls support also needs libgcrypt) ensured that --with-gnutls is only used when both gnutls and libgcrypt are enabled, but it didn't ensure libgcrypt gets built before sngrep or told the configure script where to find libgcrypt-config, breaking the build. Fix both issues. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/sngrep/sngrep.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/package/sngrep/sngrep.mk b/package/sngrep/sngrep.mk
index 4c9958d497..3f1fe989cf 100644
--- a/package/sngrep/sngrep.mk
+++ b/package/sngrep/sngrep.mk
@@ -22,7 +22,8 @@ SNGREP_DEPENDENCIES += openssl
SNGREP_CONF_OPTS += --with-openssl --without-gnutls
# gnutls support also requires libgcrypt
else ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGCRYPT),yy)
-SNGREP_DEPENDENCIES += gnutls
+SNGREP_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
+SNGREP_DEPENDENCIES += gnutls libgcrypt
SNGREP_CONF_OPTS += --with-gnutls --without-openssl
else
SNGREP_CONF_OPTS += --without-gnutls --without-openssl