]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commitdiff
sngrep: fix libgcrypt handling
authorPeter Korsgaard <peter@korsgaard.com>
Thu, 29 Mar 2018 13:58:14 +0000 (15:58 +0200)
committerPeter Korsgaard <peter@korsgaard.com>
Fri, 6 Apr 2018 18:04:53 +0000 (20:04 +0200)
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>
package/sngrep/sngrep.mk

index 7442cef529eaa3fcae2e0bffe9c93c7719f8417c..93a0c3f13e7e16406a89bf59bc087b9f9b011080 100644 (file)
@@ -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