diff options
| author | Andre McCurdy <armccurdy@gmail.com> | 2014-08-13 00:36:53 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-15 18:19:53 +0100 |
| commit | e668c79de927eff635f29fb5ff001f6b106ccc81 (patch) | |
| tree | cdf9c7956aa19538bb70f7ca855a603e7bf7de0b /meta/recipes-support/curl | |
| parent | d70bc02a80f8508995cdf8ae536a0153cebee8c9 (diff) | |
| download | openembedded-core-e668c79de927eff635f29fb5ff001f6b106ccc81.tar.gz openembedded-core-e668c79de927eff635f29fb5ff001f6b106ccc81.tar.bz2 openembedded-core-e668c79de927eff635f29fb5ff001f6b106ccc81.zip | |
curl: add zlib PACKAGECONFIG and remove hardcoded DEPENDS
Add a zlib PACKAGECONFIG control and update PACKAGECONFIG[ssl] to
include the openssl dependency. Older hardcoded DEPENDS can then
be removed.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/curl')
| -rw-r--r-- | meta/recipes-support/curl/curl_7.37.1.bb | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/meta/recipes-support/curl/curl_7.37.1.bb b/meta/recipes-support/curl/curl_7.37.1.bb index dc1d6a618f..e51e06d522 100644 --- a/meta/recipes-support/curl/curl_7.37.1.bb +++ b/meta/recipes-support/curl/curl_7.37.1.bb @@ -5,10 +5,6 @@ SECTION = "console/network" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac" -DEPENDS = "zlib gnutls" -DEPENDS_class-native = "zlib-native openssl-native" -DEPENDS_class-nativesdk = "nativesdk-zlib nativesdk-openssl" - SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://pkgconfig_fix.patch \ " @@ -23,22 +19,23 @@ SRC_URI[sha256sum] = "c3ef3cd148f3778ddbefb344117d7829db60656efe1031f9e3065fc0fa inherit autotools pkgconfig binconfig multilib_header -PACKAGECONFIG ??= "gnutls ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}" -PACKAGECONFIG_class-native = "ipv6 ssl" -PACKAGECONFIG_class-nativesdk = "ipv6 ssl" +PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)} gnutls zlib" +PACKAGECONFIG_class-native = "ipv6 ssl zlib" +PACKAGECONFIG_class-nativesdk = "ipv6 ssl zlib" + PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -PACKAGECONFIG[ssl] = "--with-ssl, --without-ssl, ," -PACKAGECONFIG[gnutls] = "--with-gnutls=${STAGING_LIBDIR}/../, --without-gnutls, gnutls," +PACKAGECONFIG[ssl] = "--with-ssl,--without-ssl,openssl" +PACKAGECONFIG[gnutls] = "--with-gnutls=${STAGING_LIBDIR}/../,--without-gnutls,gnutls" +PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ - --without-libssh2 \ +EXTRA_OECONF = "--without-libssh2 \ --with-random=/dev/urandom \ --without-libidn \ --enable-crypto-auth \ --disable-ldap \ --disable-ldaps \ --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ - " +" do_configure_prepend() { sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g ${S}/configure.ac |