summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-07-13 14:12:25 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-18 10:18:42 +0100
commita8ffa4a02c6408c80483b60ee76d3c98da52cf9a (patch)
treee045f6231e3791ff02263bfdbade9bf2f2978636
parent732a2d05fd70239cbbdde3bb7bf7e1e2b85cc8a3 (diff)
downloadpoky-a8ffa4a02c6408c80483b60ee76d3c98da52cf9a.tar.gz
curl: add PACKAGECONFIG options for brotli, built-in manpages, etc
- Add PACKAGECONFIG option for brotli (disable by default) - Add PACKAGECONFIG option for built-in manpages (disabled by default). Embedding a copy of the manpages within the curl binary adds approx 60k of gzipped data and duplicates the contents of the curl-doc package. - Add PACKAGECONFIG option for verbose error messages (enabled by default) - Disable legacy NTLM http authentication via delegation to the external winbind ntlm_auth helper (which isn't going to work without a runtime dependency on samba). (From OE-Core rev: 0bf3637a07228576d78cf4c71de92781ec143d7f) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/curl/curl_7.61.0.bb10
1 files changed, 7 insertions, 3 deletions
diff --git a/meta/recipes-support/curl/curl_7.61.0.bb b/meta/recipes-support/curl/curl_7.61.0.bb
index a80f926e9b..03d627e8bb 100644
--- a/meta/recipes-support/curl/curl_7.61.0.bb
+++ b/meta/recipes-support/curl/curl_7.61.0.bb
@@ -15,12 +15,14 @@ SRC_URI[sha256sum] = "5f6f336921cf5b84de56afbd08dfb70adeef2303751ffb3e570c936c6d
15CVE_PRODUCT = "libcurl" 15CVE_PRODUCT = "libcurl"
16inherit autotools pkgconfig binconfig multilib_header 16inherit autotools pkgconfig binconfig multilib_header
17 17
18PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} gnutls proxy threaded-resolver zlib" 18PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} gnutls proxy threaded-resolver verbose zlib"
19PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver zlib" 19PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib"
20PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver zlib" 20PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib"
21 21
22# 'ares' and 'threaded-resolver' are mutually exclusive 22# 'ares' and 'threaded-resolver' are mutually exclusive
23PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" 23PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares"
24PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli"
25PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual"
24PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," 26PACKAGECONFIG[dict] = "--enable-dict,--disable-dict,"
25PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" 27PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls"
26PACKAGECONFIG[gopher] = "--enable-gopher,--disable-gopher," 28PACKAGECONFIG[gopher] = "--enable-gopher,--disable-gopher,"
@@ -43,9 +45,11 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss
43PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," 45PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet,"
44PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," 46PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp,"
45PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" 47PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver"
48PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose"
46PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" 49PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib"
47 50
48EXTRA_OECONF = " \ 51EXTRA_OECONF = " \
52 --disable-ntlm-wb \
49 --enable-crypto-auth \ 53 --enable-crypto-auth \
50 --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ 54 --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \
51 --without-libmetalink \ 55 --without-libmetalink \