[oe-commits] Henning Heinold : curl: fix native build when ldap-headers are installed on the host
git version control
git at git.openembedded.org
Tue Mar 1 18:54:49 UTC 2011
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 0f7996bb4d6dfd9471f8ba5c3c1eb996110100bd
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=0f7996bb4d6dfd9471f8ba5c3c1eb996110100bd
Author: Henning Heinold <heinold at inf.fu-berlin.de>
Date: Tue Mar 1 19:37:51 2011 +0100
curl: fix native build when ldap-headers are installed on the host
* there were serval build error reported for curl-native,
when ldap-dev stuff was installed on the build-host,
so we explicit disable the build of ldap and ldaps protocls
for native, nativesdk and sdk
* put the BBCLASSEXTEND line into common.inc rather than into
the versions packages it self
* bump INC_PR
---
recipes/curl/curl-common.inc | 8 +++++++-
recipes/curl/curl_7.21.1.bb | 1 -
recipes/curl/curl_7.21.2.bb | 1 -
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/recipes/curl/curl-common.inc b/recipes/curl/curl-common.inc
index ddaebb8..f18f231 100644
--- a/recipes/curl/curl-common.inc
+++ b/recipes/curl/curl-common.inc
@@ -6,7 +6,9 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2;name=tarball \
file://pkgconfig_fix.patch"
S = "${WORKDIR}/curl-${PV}"
-INC_PR = "r4"
+INC_PR = "r5"
+
+BBCLASSEXTEND = "native nativesdk sdk"
CURL_FEATURES = ${@['zlib,cookies,crypto-auth,dict,file,ftp,http,telnet,tftp','zlib,gnutls,cookies,crypto-auth,dict,file,ftp,http,telnet,tftp']["${BPN}" == "${PN}"]}
# other allowed features: ipv6, ares, openssl
@@ -19,6 +21,10 @@ EXTRA_OECONF = " \
--without-libidn \
"
+EXTRA_OECONF_append_virtclass-native = " --disable-ldap --disable-ldaps"
+EXTRA_OECONF_append_virtclass-nativesdk = " --disable-ldap --disable-ldaps"
+EXTRA_OECONF_append_virtclass-sdk = " --disable-ldap --disable-ldaps"
+
python __anonymous() {
f = bb.data.getVar("CURL_FEATURES", d, True).split(",")
oeconf = bb.data.getVar("EXTRA_OECONF", d, False)
diff --git a/recipes/curl/curl_7.21.1.bb b/recipes/curl/curl_7.21.1.bb
index 5df4d6b..0fac772 100644
--- a/recipes/curl/curl_7.21.1.bb
+++ b/recipes/curl/curl_7.21.1.bb
@@ -6,6 +6,5 @@ PR = "${INC_PR}.1"
SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
file://off_t_abi_fix.patch;striplevel=0"
-BBCLASSEXTEND = "native nativesdk sdk"
SRC_URI[md5sum] = "eafde5b933bce1c1dca82d1054c8d967"
SRC_URI[sha256sum] = "653b3214005c778a8c642af4e5dea46c74f7bf51017a568bb8725ea9eda73643"
diff --git a/recipes/curl/curl_7.21.2.bb b/recipes/curl/curl_7.21.2.bb
index 8402e31..d7d865d 100644
--- a/recipes/curl/curl_7.21.2.bb
+++ b/recipes/curl/curl_7.21.2.bb
@@ -6,6 +6,5 @@ PR = "${INC_PR}.0"
SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
file://off_t_abi_fix.patch;striplevel=0"
-BBCLASSEXTEND = "native nativesdk sdk"
SRC_URI[md5sum] = "ca96df88e044c7c25d19692ec8b250b2"
SRC_URI[sha256sum] = "f4a632e704f28767e6bbffcc6112db0590b1c9d50d8226d706ad39632355bf21"
More information about the Openembedded-commits
mailing list