diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2018-03-29 15:58:14 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2018-04-06 20:04:53 +0200 |
| commit | d56fdb17f0a81e8e8e30c93cc038736363d1b3c0 (patch) | |
| tree | dad47219d9428ba39d4126c0d43dc3fc493d41f0 | |
| parent | 8c8f9fda90fd59c3120e1076f8507b16871ae4ed (diff) | |
| download | buildroot-d56fdb17f0a81e8e8e30c93cc038736363d1b3c0.tar.gz buildroot-d56fdb17f0a81e8e8e30c93cc038736363d1b3c0.zip | |
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.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/package/sngrep/sngrep.mk b/package/sngrep/sngrep.mk index 7442cef529..93a0c3f13e 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 |
