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-04-11 17:22:04 +0200
commitc1ce76dba48534ef35ba16b27bdde7777f4e5599 (patch)
tree9e9075c7d4ccd97a0b9df0819661bf615c820752
parent3d5be0c7152f679c3577a994a79b384999133658 (diff)
downloadbuildroot-c1ce76dba48534ef35ba16b27bdde7777f4e5599.tar.gz
buildroot-c1ce76dba48534ef35ba16b27bdde7777f4e5599.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> (cherry picked from commit ae7d59eaae1c55d707b2a70437a84c280f598572) 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 1e0e051433..a76887e7dd 100644
--- a/package/sngrep/sngrep.mk
+++ b/package/sngrep/sngrep.mk
@@ -23,7 +23,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