summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2014-08-13 00:36:53 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-15 18:21:51 +0100
commit89d3db7c89793e73ae28cf709f90317588d11846 (patch)
tree8d6ea7731f1190a17133a6f46e8de83660240c31 /meta/recipes-support
parentae8d3bc5228d8f1a265c81b1539d60f4ccf541a7 (diff)
downloadpoky-89d3db7c89793e73ae28cf709f90317588d11846.tar.gz
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. (From OE-Core rev: e668c79de927eff635f29fb5ff001f6b106ccc81) 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.37.1.bb21
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"
5LICENSE = "MIT" 5LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac" 6LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac"
7 7
8DEPENDS = "zlib gnutls"
9DEPENDS_class-native = "zlib-native openssl-native"
10DEPENDS_class-nativesdk = "nativesdk-zlib nativesdk-openssl"
11
12SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ 8SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
13 file://pkgconfig_fix.patch \ 9 file://pkgconfig_fix.patch \
14" 10"
@@ -23,22 +19,23 @@ SRC_URI[sha256sum] = "c3ef3cd148f3778ddbefb344117d7829db60656efe1031f9e3065fc0fa
23 19
24inherit autotools pkgconfig binconfig multilib_header 20inherit autotools pkgconfig binconfig multilib_header
25 21
26PACKAGECONFIG ??= "gnutls ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}" 22PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)} gnutls zlib"
27PACKAGECONFIG_class-native = "ipv6 ssl" 23PACKAGECONFIG_class-native = "ipv6 ssl zlib"
28PACKAGECONFIG_class-nativesdk = "ipv6 ssl" 24PACKAGECONFIG_class-nativesdk = "ipv6 ssl zlib"
25
29PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 26PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
30PACKAGECONFIG[ssl] = "--with-ssl, --without-ssl, ," 27PACKAGECONFIG[ssl] = "--with-ssl,--without-ssl,openssl"
31PACKAGECONFIG[gnutls] = "--with-gnutls=${STAGING_LIBDIR}/../, --without-gnutls, gnutls," 28PACKAGECONFIG[gnutls] = "--with-gnutls=${STAGING_LIBDIR}/../,--without-gnutls,gnutls"
29PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib"
32 30
33EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ 31EXTRA_OECONF = "--without-libssh2 \
34 --without-libssh2 \
35 --with-random=/dev/urandom \ 32 --with-random=/dev/urandom \
36 --without-libidn \ 33 --without-libidn \
37 --enable-crypto-auth \ 34 --enable-crypto-auth \
38 --disable-ldap \ 35 --disable-ldap \
39 --disable-ldaps \ 36 --disable-ldaps \
40 --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ 37 --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \
41 " 38"
42 39
43do_configure_prepend() { 40do_configure_prepend() {
44 sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g ${S}/configure.ac 41 sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g ${S}/configure.ac