summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabrice Fontaine <fontaine.fabrice@gmail.com>2018-05-01 22:40:33 +0200
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-05-20 16:10:43 +0200
commit8451acf298714cd3870366c82a26eafc9c2c00b7 (patch)
tree141642d7b937bb7c5a232827c8404a3e1becff5f
parentffb85a4a16df94e4980057a194e5fdc3c8332e32 (diff)
downloadbuildroot-8451acf298714cd3870366c82a26eafc9c2c00b7.tar.gz
buildroot-8451acf298714cd3870366c82a26eafc9c2c00b7.zip
libcurl: replace libidn by libidn2
libidn has been replaced by libidn2 since 7.51.0 (October 2016): https://github.com/curl/curl/commit/9c91ec778104ae3b744b39444d544e82d5ee9ece Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/libcurl/libcurl.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index a3e66d094c..b75e9fb2e9 100644
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -9,7 +9,6 @@ LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz
LIBCURL_SITE = https://curl.haxx.se/download
LIBCURL_DEPENDENCIES = host-pkgconf \
$(if $(BR2_PACKAGE_ZLIB),zlib) \
- $(if $(BR2_PACKAGE_LIBIDN),libidn) \
$(if $(BR2_PACKAGE_RTMPDUMP),rtmpdump)
LIBCURL_LICENSE = curl
LIBCURL_LICENSE_FILES = COPYING
@@ -68,6 +67,13 @@ else
LIBCURL_CONF_OPTS += --disable-ares
endif
+ifeq ($(BR2_PACKAGE_LIBIDN2),y)
+LIBCURL_DEPENDENCIES += libidn2
+LIBCURL_CONF_OPTS += --with-libidn2
+else
+LIBCURL_CONF_OPTS += --without-libidn2
+endif
+
# Configure curl to support libssh2
ifeq ($(BR2_PACKAGE_LIBSSH2),y)
LIBCURL_DEPENDENCIES += libssh2
OpenPOWER on IntegriCloud