summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-06-24 17:13:20 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-25 13:51:47 +0100
commit97294829cde141c8b6b50418de27f53507f5764e (patch)
treeb869396ed906c4a9765479a641ba92610431be6a /meta
parent224a183c05c5ac372973518b4399b383e38a4ed5 (diff)
downloadpoky-97294829cde141c8b6b50418de27f53507f5764e.tar.gz
curl: Convert CURLGNUTL to PACKAGECONFIG
This will allow for easier configuration of curl for SSL vs gnutls [YOCTO #6329] (From OE-Core rev: 6a8144390eb2dee6e1baf7be75cffcacbb247002) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/curl/curl_7.37.0.bb18
1 files changed, 7 insertions, 11 deletions
diff --git a/meta/recipes-support/curl/curl_7.37.0.bb b/meta/recipes-support/curl/curl_7.37.0.bb
index 1dc4ff3249..f6b05a7787 100644
--- a/meta/recipes-support/curl/curl_7.37.0.bb
+++ b/meta/recipes-support/curl/curl_7.37.0.bb
@@ -23,6 +23,13 @@ SRC_URI[sha256sum] = "24502492de3168b0556d8e1a06f14f7589e57b204917d602a572e14239
23 23
24inherit autotools pkgconfig binconfig multilib_header 24inherit autotools pkgconfig binconfig multilib_header
25 25
26PACKAGECONFIG ??= "gnutls ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}"
27PACKAGECONFIG_class-native = "ipv6 ssl"
28PACKAGECONFIG_class-nativesdk = "ipv6"
29PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
30PACKAGECONFIG[ssl] = "--with-ssl, --without-ssl, ,"
31PACKAGECONFIG[gnutls] = "--with-gnutls=${STAGING_LIBDIR}/../, --without-gnutls, gnutls,"
32
26EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ 33EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
27 --without-libssh2 \ 34 --without-libssh2 \
28 --with-random=/dev/urandom \ 35 --with-random=/dev/urandom \
@@ -31,19 +38,8 @@ EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
31 --disable-ldap \ 38 --disable-ldap \
32 --disable-ldaps \ 39 --disable-ldaps \
33 --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ 40 --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \
34 ${CURLGNUTLS} \
35 " 41 "
36 42
37CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../ --without-ssl"
38CURLGNUTLS_class-native = "--without-gnutls --with-ssl"
39CURLGNUTLS_class-nativesdk = "--without-gnutls --without-ssl"
40
41PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}"
42PACKAGECONFIG_class-native = "ipv6"
43PACKAGECONFIG_class-nativesdk = "ipv6"
44
45PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
46
47do_configure_prepend() { 43do_configure_prepend() {
48 sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g ${S}/configure.ac 44 sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g ${S}/configure.ac
49} 45}