diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2012-08-06 13:57:04 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-06 15:18:52 +0100 |
commit | e78843e28aeed3998a2fc3391ac1f9be9f1e1f94 (patch) | |
tree | 9a8b313cca7f3d5343fae53975a5d6cc19e6c983 /meta | |
parent | 2a88d4df8eb35b67cf0bdb2573abc7fbb5a7d108 (diff) | |
download | poky-e78843e28aeed3998a2fc3391ac1f9be9f1e1f94.tar.gz |
curl: disable ldap/ldaps explicitly
* openldap from meta-oe is autodetected and then libldap-2.4-2 runtime dependency added to curl and almost all meta-efl recipes
(From OE-Core rev: 666b67179d4492e4d950b94457ebf8cac6454f7d)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/curl/curl_7.26.0.bb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/meta/recipes-support/curl/curl_7.26.0.bb b/meta/recipes-support/curl/curl_7.26.0.bb index f04b4008d6..418e29ca8f 100644 --- a/meta/recipes-support/curl/curl_7.26.0.bb +++ b/meta/recipes-support/curl/curl_7.26.0.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e66 | |||
8 | DEPENDS = "zlib gnutls" | 8 | DEPENDS = "zlib gnutls" |
9 | DEPENDS_virtclass-native = "zlib-native openssl-native" | 9 | DEPENDS_virtclass-native = "zlib-native openssl-native" |
10 | DEPENDS_virtclass-nativesdk = "zlib-nativesdk" | 10 | DEPENDS_virtclass-nativesdk = "zlib-nativesdk" |
11 | PR = "r0" | 11 | PR = "r1" |
12 | 12 | ||
13 | SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ | 13 | SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ |
14 | file://pkgconfig_fix.patch" | 14 | file://pkgconfig_fix.patch" |
@@ -20,11 +20,13 @@ inherit autotools pkgconfig binconfig | |||
20 | 20 | ||
21 | EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ | 21 | EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ |
22 | --without-libssh2 \ | 22 | --without-libssh2 \ |
23 | --with-random=/dev/urandom \ | 23 | --with-random=/dev/urandom \ |
24 | --without-libidn \ | 24 | --without-libidn \ |
25 | --enable-crypto-auth \ | 25 | --enable-crypto-auth \ |
26 | --disable-ldap \ | ||
27 | --disable-ldaps \ | ||
26 | ${CURLGNUTLS} \ | 28 | ${CURLGNUTLS} \ |
27 | " | 29 | " |
28 | 30 | ||
29 | CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../ --without-ssl" | 31 | CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../ --without-ssl" |
30 | CURLGNUTLS_virtclass-native = "--without-gnutls --with-ssl" | 32 | CURLGNUTLS_virtclass-native = "--without-gnutls --with-ssl" |