[oe-commits] Dmitry Eremin-Solenikov : curl: fix dependencies of native package
git version control
git at git.openembedded.org
Thu Nov 12 05:12:27 UTC 2009
Module: openembedded.git
Branch: shr/merge
Commit: bf132a8996db2e75ce4d9e754ea50fa487c52160
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=bf132a8996db2e75ce4d9e754ea50fa487c52160
Author: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
Date: Thu Nov 12 03:06:43 2009 +0300
curl: fix dependencies of native package
As curl-common generates deps looking at the list of necessary features,
curl-native packages get deps like openssl, gnutls, etc. (target packages).
Fix that by generating correct dependencies during calculation.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
---
recipes/curl/curl-common.inc | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/recipes/curl/curl-common.inc b/recipes/curl/curl-common.inc
index 29af47e..4af85ba 100644
--- a/recipes/curl/curl-common.inc
+++ b/recipes/curl/curl-common.inc
@@ -23,6 +23,11 @@ python __anonymous() {
f = bb.data.getVar("CURL_FEATURES", d, True).split(",")
oeconf = bb.data.getVar("EXTRA_OECONF", d, False)
deps = bb.data.getVar("DEPENDS", d, False).split()
+ pn = bb.data.getVar("PN", d, True)
+ if "native" in pn:
+ native = "-native"
+ else:
+ native = ""
for x in [ 'cookies', 'crypto-auth', 'dict', 'file', 'ftp', 'http', 'telnet', 'tftp', 'ipv6' ]:
if x in f:
oeconf += " --enable-%s" % x
@@ -30,22 +35,22 @@ python __anonymous() {
oeconf += " --disable-%s" % x
if 'zlib' in f:
oeconf += " --with-zlib=${STAGING_LIBDIR}/../"
- deps.append("zlib")
+ deps.append("zlib" + native)
else:
oeconf += " --without-zlib"
if 'gnutls' in f:
oeconf += " --with-gnutls=${STAGING_BINDIR_CROSS}"
- deps.append("gnutls")
+ deps.append("gnutls" + native)
else:
oeconf += " --without-gnutls"
if 'openssl' in f:
oeconf += " --with-ssl=${STAGING_LIBDIR}/../"
- deps.append("openssl")
+ deps.append("openssl" + native)
else:
oeconf += " --without-ssl"
if 'ares' in f:
oeconf += " --enable-ares"
- deps.append("c-ares")
+ deps.append("c-ares" + native)
else:
oeconf += " --disable-ares"
bb.data.setVar('EXTRA_OECONF', oeconf, d)
More information about the Openembedded-commits
mailing list