summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-02-17 13:35:37 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-19 01:01:25 +0000
commit5f3dfeacc52cdeaa2ca85e23453bf29b110795dd (patch)
tree6cb4e20a94be48124e1c430a767ab721aebd2d0a /meta/recipes-support
parent1f61888709efb396891a204724178dc30656310d (diff)
downloadpoky-5f3dfeacc52cdeaa2ca85e23453bf29b110795dd.tar.gz
curl: re-enable proxy support by default
Proxy support is a feature, so should not have been disabled in the previous commit (which disabled support for legacy protocols): http://git.openembedded.org/openembedded-core/commit/?id=b26634900d487a22eef41e9e077d35fb347d4c29 (From OE-Core rev: dfb0064fb16eba1446b8f3db13e0b8b3b4764481) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/curl/curl_7.47.1.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-support/curl/curl_7.47.1.bb b/meta/recipes-support/curl/curl_7.47.1.bb
index 0872dbee55..7e2664c2d9 100644
--- a/meta/recipes-support/curl/curl_7.47.1.bb
+++ b/meta/recipes-support/curl/curl_7.47.1.bb
@@ -17,9 +17,9 @@ SRC_URI[sha256sum] = "ddc643ab9382e24bbe4747d43df189a0a6ce38fcb33df041b9cb0b3cd4
17 17
18inherit autotools pkgconfig binconfig multilib_header 18inherit autotools pkgconfig binconfig multilib_header
19 19
20PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)} gnutls zlib" 20PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)} gnutls proxy zlib"
21PACKAGECONFIG_class-native = "ipv6 ssl zlib" 21PACKAGECONFIG_class-native = "ipv6 proxy ssl zlib"
22PACKAGECONFIG_class-nativesdk = "ipv6 ssl zlib" 22PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl zlib"
23 23
24PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," 24PACKAGECONFIG[dict] = "--enable-dict,--disable-dict,"
25PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" 25PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls"