curl: fix dependencies of native package
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Thu, 12 Nov 2009 00:06:43 +0000 (03:06 +0300)
committerDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Thu, 12 Nov 2009 00:08:18 +0000 (03:08 +0300)
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@gmail.com>
recipes/curl/curl-common.inc

index 29af47e..4af85ba 100644 (file)
@@ -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)