From e78843e28aeed3998a2fc3391ac1f9be9f1e1f94 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 6 Aug 2012 13:57:04 +0200 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-support/curl/curl_7.26.0.bb | 12 +++++++----- 1 file 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 DEPENDS = "zlib gnutls" DEPENDS_virtclass-native = "zlib-native openssl-native" DEPENDS_virtclass-nativesdk = "zlib-nativesdk" -PR = "r0" +PR = "r1" SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://pkgconfig_fix.patch" @@ -20,11 +20,13 @@ inherit autotools pkgconfig binconfig EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ --without-libssh2 \ - --with-random=/dev/urandom \ - --without-libidn \ - --enable-crypto-auth \ + --with-random=/dev/urandom \ + --without-libidn \ + --enable-crypto-auth \ + --disable-ldap \ + --disable-ldaps \ ${CURLGNUTLS} \ - " + " CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../ --without-ssl" CURLGNUTLS_virtclass-native = "--without-gnutls --with-ssl" -- cgit v1.2.3-54-g00ecf