diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2014-06-12 10:29:02 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-14 08:43:55 +0100 |
commit | a7d0c856db0ebc77a3feeb1a0c900ce116247e89 (patch) | |
tree | 2149b8311bbaf903d90b8b453e5f2b0e29c9ed85 | |
parent | d76e718fee7a1a7b1e2379cd6e59b2b0be95f6e9 (diff) | |
download | poky-a7d0c856db0ebc77a3feeb1a0c900ce116247e89.tar.gz |
curl: control ipv6 support based on DISTRO feature
By default ipv6 is auto detected for native builds but disabled when
cross compiling.
This commit adds a PACKAGECONFIG option, unconditionally enabled for
native and nativesdk builds and controlled by the ipv6 DISTRO feature
for target builds.
(From OE-Core rev: f8377e96b353f8cf4a5812fa14c1c0405f769096)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/curl/curl_7.36.0.bb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/recipes-support/curl/curl_7.36.0.bb b/meta/recipes-support/curl/curl_7.36.0.bb index 56eb1a25a0..54ea6d407f 100644 --- a/meta/recipes-support/curl/curl_7.36.0.bb +++ b/meta/recipes-support/curl/curl_7.36.0.bb | |||
@@ -40,6 +40,12 @@ CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../ --without-ssl" | |||
40 | CURLGNUTLS_class-native = "--without-gnutls --with-ssl" | 40 | CURLGNUTLS_class-native = "--without-gnutls --with-ssl" |
41 | CURLGNUTLS_class-nativesdk = "--without-gnutls --without-ssl" | 41 | CURLGNUTLS_class-nativesdk = "--without-gnutls --without-ssl" |
42 | 42 | ||
43 | PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}" | ||
44 | PACKAGECONFIG_class-native = "ipv6" | ||
45 | PACKAGECONFIG_class-nativesdk = "ipv6" | ||
46 | |||
47 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | ||
48 | |||
43 | do_configure_prepend() { | 49 | do_configure_prepend() { |
44 | sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g ${S}/configure.ac | 50 | sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g ${S}/configure.ac |
45 | } | 51 | } |