summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-02-10 18:58:02 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-11 22:33:39 (GMT)
commit1f3e1d1e3fbcc2a9319f1c4c9bfffafaf1154d06 (patch)
tree259dd12ecde67e488fd6ad404e7ab769b69de3ad
parent19045bab71f45ec60a87aa6660be557de82072b2 (diff)
downloadpoky-1f3e1d1e3fbcc2a9319f1c4c9bfffafaf1154d06.tar.gz
curl: add PACKAGECONFIG options for less common / legacy protocols
As a result of this commit, the following protocols will now be disabled by default: DICT GOPHER IMAP IMAPS POP3 POP3S RTSP SMTP SMTPS TELNET TFTP Also add a PACKAGECONFIG option for libidn (previously disabled unconditionally). (From OE-Core rev: b26634900d487a22eef41e9e077d35fb347d4c29) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/curl/curl_7.47.1.bb32
1 files changed, 23 insertions, 9 deletions
diff --git a/meta/recipes-support/curl/curl_7.47.1.bb b/meta/recipes-support/curl/curl_7.47.1.bb
index 210147c..0872dbe 100644
--- a/meta/recipes-support/curl/curl_7.47.1.bb
+++ b/meta/recipes-support/curl/curl_7.47.1.bb
@@ -21,20 +21,34 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d
21PACKAGECONFIG_class-native = "ipv6 ssl zlib" 21PACKAGECONFIG_class-native = "ipv6 ssl zlib"
22PACKAGECONFIG_class-nativesdk = "ipv6 ssl zlib" 22PACKAGECONFIG_class-nativesdk = "ipv6 ssl zlib"
23 23
24PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 24PACKAGECONFIG[dict] = "--enable-dict,--disable-dict,"
25PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openssl"
26PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" 25PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls"
27PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" 26PACKAGECONFIG[gopher] = "--enable-gopher,--disable-gopher,"
28PACKAGECONFIG[rtmpdump] = "--with-librtmp,--without-librtmp,rtmpdump" 27PACKAGECONFIG[imap] = "--enable-imap,--disable-imap,"
28PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
29PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,"
30PACKAGECONFIG[ldaps] = "--enable-ldaps,--disable-ldaps,"
31PACKAGECONFIG[libidn] = "--with-libidn,--without-libidn,libidn"
29PACKAGECONFIG[libssh2] = "--with-libssh2,--without-libssh2,libssh2" 32PACKAGECONFIG[libssh2] = "--with-libssh2,--without-libssh2,libssh2"
33PACKAGECONFIG[pop3] = "--enable-pop3,--disable-pop3,"
34PACKAGECONFIG[proxy] = "--enable-proxy,--disable-proxy,"
35PACKAGECONFIG[rtmpdump] = "--with-librtmp,--without-librtmp,rtmpdump"
36PACKAGECONFIG[rtsp] = "--enable-rtsp,--disable-rtsp,"
30PACKAGECONFIG[smb] = "--enable-smb,--disable-smb," 37PACKAGECONFIG[smb] = "--enable-smb,--disable-smb,"
38PACKAGECONFIG[smtp] = "--enable-smtp,--disable-smtp,"
39PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openssl"
40PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet,"
41PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp,"
42PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib"
31 43
32EXTRA_OECONF = "--without-libidn \ 44EXTRA_OECONF = " \
33 --enable-crypto-auth \ 45 --enable-crypto-auth \
34 --disable-ldap \ 46 --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \
35 --disable-ldaps \ 47 --without-libmetalink \
36 --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ 48 --without-libpsl \
49 --without-nghttp2 \
37" 50"
51
38# see https://lists.yoctoproject.org/pipermail/poky/2013-December/009435.html 52# see https://lists.yoctoproject.org/pipermail/poky/2013-December/009435.html
39# We should ideally drop ac_cv_sizeof_off_t from site files but until then 53# We should ideally drop ac_cv_sizeof_off_t from site files but until then
40EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'ac_cv_sizeof_off_t=8', '', d)}" 54EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'ac_cv_sizeof_off_t=8', '', d)}"