From f75f370c829381c8e02ab4e5e57e9f5901ac0785 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 3 Apr 2018 00:41:44 +0300 Subject: [PATCH] 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 Cc: Matt Weber Signed-off-by: Baruch Siach Reviewed-by: Matt Weber Signed-off-by: Peter Korsgaard (cherry picked from commit e7d658e0291b78553bf4eca704f0d0202bcf031f) Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.mk | 7 +++++++ 1 file changed, 7 insertions(+) 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