| Message ID | 13524327ea113de73f2201143641c0dfcaa50d30.1522705304.git.baruch@tkos.co.il |
|---|---|
| State | Accepted |
| Commit | e7d658e0291b78553bf4eca704f0d0202bcf031f |
| Headers | show |
| Series | libcurl: add brotli optional dependency | expand |
Baruch, On Mon, Apr 2, 2018 at 4:41 PM, Baruch Siach <baruch@tkos.co.il> wrote: > > 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 users 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>
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes: > 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 users pkg-config to figure s/users/uses/ Committed, thanks.
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes: > 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 users 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> Committed to 2018.02.x, thanks.
diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index c6289e05f4cb..a3e66d094cf3 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -76,6 +76,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
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 users 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> --- package/libcurl/libcurl.mk | 7 +++++++ 1 file changed, 7 insertions(+)