summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2015-11-26 14:47:01 -0300
committerPeter Korsgaard <peter@korsgaard.com>2015-11-26 21:21:12 +0100
commit2b4b915dd02b4c36568876350c3930ec357553d3 (patch)
tree7ec4fd7cae81ac5ac4d35dff2b5726b92aca0256
parent33e81e381a3fe1003e403cc0fca95a131e01747e (diff)
downloadbuildroot-2b4b915dd02b4c36568876350c3930ec357553d3.tar.gz
buildroot-2b4b915dd02b4c36568876350c3930ec357553d3.zip
libgsasl: fix auto dependencies
IDN can be picked up from the distro installation so use a prefix when it's available or otherwise just disable it, fixes: http://autobuild.buildroot.org/results/5d9/5d9baf528c47c5167ec8d2a6941cb06b4ca761ca/ Also disable libgcrypt support which wasn't accounted for and doesn't seem to work either to possibly avoid the same problem. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/libgsasl/libgsasl.mk10
1 files changed, 9 insertions, 1 deletions
diff --git a/package/libgsasl/libgsasl.mk b/package/libgsasl/libgsasl.mk
index f2660ca4fa..00ce8e0375 100644
--- a/package/libgsasl/libgsasl.mk
+++ b/package/libgsasl/libgsasl.mk
@@ -9,6 +9,14 @@ LIBGSASL_SITE = $(BR2_GNU_MIRROR)/gsasl
LIBGSASL_LICENSE = LGPLv2.1+ (library), GPLv3+ (programs)
LIBGSASL_LICENSE_FILES = README COPYING.LIB COPYING
LIBGSASL_INSTALL_STAGING = YES
-LIBGSASL_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBIDN),libidn)
+# It doesn't seem to build with our libgcrypt so better be safe
+LIBGSASL_CONF_OPTS = --without-libgcrypt
+
+ifeq ($(BR2_PACKAGE_LIBIDN),y)
+LIBGSASL_CONF_OPTS += --with-libidn-prefix=$(STAGING_DIR)/usr
+LIBGSASL_DEPENDENCIES += libidn
+else
+LIBGSASL_CONF_OPTS += --without-stringprep
+endif
$(eval $(autotools-package))
OpenPOWER on IntegriCloud