diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/curl/curl_7.37.0.bb | 18 |
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 | ||
24 | inherit autotools pkgconfig binconfig multilib_header | 24 | inherit autotools pkgconfig binconfig multilib_header |
25 | 25 | ||
26 | PACKAGECONFIG ??= "gnutls ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}" | ||
27 | PACKAGECONFIG_class-native = "ipv6 ssl" | ||
28 | PACKAGECONFIG_class-nativesdk = "ipv6" | ||
29 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | ||
30 | PACKAGECONFIG[ssl] = "--with-ssl, --without-ssl, ," | ||
31 | PACKAGECONFIG[gnutls] = "--with-gnutls=${STAGING_LIBDIR}/../, --without-gnutls, gnutls," | ||
32 | |||
26 | EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ | 33 | EXTRA_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 | ||
37 | CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../ --without-ssl" | ||
38 | CURLGNUTLS_class-native = "--without-gnutls --with-ssl" | ||
39 | CURLGNUTLS_class-nativesdk = "--without-gnutls --without-ssl" | ||
40 | |||
41 | PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}" | ||
42 | PACKAGECONFIG_class-native = "ipv6" | ||
43 | PACKAGECONFIG_class-nativesdk = "ipv6" | ||
44 | |||
45 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | ||
46 | |||
47 | do_configure_prepend() { | 43 | do_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 | } |