bitbake.conf/siteinfo.bbclass/package.bbclass: Add in support for 'darwin8'

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4424 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 97eae6e97feb255b90d44c776f593ae383106cb8..3ca8532376677fae03c966bba1662293c7c30811 100644 (file)
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -626,25 +626,26 @@ python package_do_shlibs() {
 
                        #bb.note("Foo2: %s" % lafile)
                        #bb.note("Foo %s %s" % (file, fullpath))
-                       fd = open(lafile, 'r')
-                       lines = fd.readlines()
-                       fd.close()
-                       for l in lines:
-                               m = re.match("\s*dependency_libs=\s*'(.*)'", l)
-                               if m:
-                                       deps = m.group(1).split(" ")
-                                       for dep in deps:
-                                               #bb.note("Trying %s for %s" % (dep, pkg))
-                                               name = None
-                                               if dep.endswith(".la"):
-                                                       name = os.path.basename(dep).replace(".la", "")
-                                               elif dep.startswith("-l"):
-                                                       name = dep.replace("-l", "lib")
-                                               if pkg not in needed:
-                                                       needed[pkg] = []
-                                               if name:
-                                                       needed[pkg].append(name)
-                                                       #bb.note("Adding %s for %s" % (name, pkg))
+                       if os.path.exists(lafile):
+                               fd = open(lafile, 'r')
+                               lines = fd.readlines()
+                               fd.close()
+                               for l in lines:
+                                       m = re.match("\s*dependency_libs=\s*'(.*)'", l)
+                                       if m:
+                                               deps = m.group(1).split(" ")
+                                               for dep in deps:
+                                                       #bb.note("Trying %s for %s" % (dep, pkg))
+                                                       name = None
+                                                       if dep.endswith(".la"):
+                                                               name = os.path.basename(dep).replace(".la", "")
+                                                       elif dep.startswith("-l"):
+                                                               name = dep.replace("-l", "lib")
+                                                       if pkg not in needed:
+                                                               needed[pkg] = []
+                                                       if name:
+                                                               needed[pkg].append(name)
+                                                               #bb.note("Adding %s for %s" % (name, pkg))
        needed = {}
        private_libs = bb.data.getVar('PRIVATE_LIBS', d, 1)
        for pkg in packages.split():
@@ -658,7 +659,7 @@ python package_do_shlibs() {
                        for file in files:
                                soname = None
                                path = os.path.join(root, file)
-                               if targetos == "darwin":
+                               if targetos == "darwin" or targetos == "darwin8":
                                        darwin_so(root, dirs, file)
                                elif os.access(path, os.X_OK) or lib_re.match(file):
                                        linux_so(root, dirs, file)

diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass
index a3b67b579846f4b2d4001e8e36fd91b3bfa96c2e..431b81ce297c186001d0ce86affa1ae9dbb75b05 100644 (file)
--- a/meta/classes/siteinfo.bbclass
+++ b/meta/classes/siteinfo.bbclass
@@ -26,6 +26,7 @@ def get_siteinfo_list(d):
                "armeb-linux-uclibc":      "endian-big bit-32 common-uclibc arm-common",\
                "armeb-linux-uclibcgnueabi": "endian-big bit-32 common-uclibc arm-common armeb-linux-uclibc",\
                "arm-darwin":              "endian-little bit-32 common-darwin",\
+               "arm-darwin8":              "endian-little bit-32 common-darwin",\
                "arm-linux":               "endian-little bit-32 common-glibc arm-common",\
                "arm-linux-gnueabi":       "endian-little bit-32 common-glibc arm-common arm-linux",\
                "arm-linux-uclibc":        "endian-little bit-32 common-uclibc arm-common",\

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 4eca4296c80149b24c149bea038e2cfa9ea62995..19e4cddc55f3e9c3e3f76a650d9bdc46ccff64e4 100644 (file)
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -162,8 +162,11 @@ MULTI_PROVIDER_WHITELIST = "virtual/libintl"
 
 SOLIBS = ".so.*"
 SOLIBS_darwin = ".*.dylib"
+SOLIBS_darwin8 = ".*.dylib"
+
 SOLIBSDEV = ".so"
 SOLIBSDEV_darwin = ".dylib"
+SOLIBSDEV_darwin8 = ".dylib"
 
 PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
 FILES = ""