aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Baruch Siach <baruch@tkos.co.il>2018-04-03 00:41:44 +0300
committerGravatar Peter Korsgaard <peter@korsgaard.com>2018-10-11 20:32:48 +0200
commitf75f370c829381c8e02ab4e5e57e9f5901ac0785 (patch)
treef32b8248840b4c5fead00bc8b9f58f981ac5d98e
parent45e5d2ce68650b075468c02f5c9c43b40c1ab81d (diff)
downloadbuildroot-f75f370c829381c8e02ab4e5e57e9f5901ac0785.tar.gz
buildroot-f75f370c829381c8e02ab4e5e57e9f5901ac0785.tar.bz2
libcurl: add brotli optional dependency
The brotli package has recently been added to Buildroot. Add brotli an an optional dependency to libcurl to make the build consistent. It turns out that libcurl configure script uses pkg-config to figure out link libraries only when --with-brotli is explicitly set. So this also fixes static build failure. Fixes: http://autobuild.buildroot.net/results/64b/64bc0dfe284206390ae0680b94c0876863a3c0f3/ http://autobuild.buildroot.net/results/233/23376d8653dea6361e42b0f17b6aaab3c14d99cf/ http://autobuild.buildroot.net/results/b19/b198db4b69e18e6d01ec95aae9c6096c1912dd9c/ Cc: Adrian Perez de Castro <aperez@igalia.com> Cc: Matt Weber <matthew.weber@rockwellcollins.com> Signed-off-by: Baruch Siach <baruch@tkos.co.il> Reviewed-by: Matt Weber <matthew.weber@rockwellcollins.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com> (cherry picked from commit e7d658e0291b78553bf4eca704f0d0202bcf031f) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/libcurl/libcurl.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index 92c1a1fb7a..7993062c6e 100644
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -75,6 +75,13 @@ else
LIBCURL_CONF_OPTS += --without-libssh2
endif
+ifeq ($(BR2_PACKAGE_BROTLI),y)
+LIBCURL_DEPENDENCIES += brotli
+LIBCURL_CONF_OPTS += --with-brotli
+else
+LIBCURL_CONF_OPTS += --without-brotli
+endif
+
define LIBCURL_FIX_DOT_PC
printf 'Requires: openssl\n' >>$(@D)/libcurl.pc.in
endef