summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-05-05 22:19:28 +0000
committerRichard Purdie <richard@openedhand.com>2008-05-05 22:19:28 +0000
commit3b534889872e6d0cc6b3ef9e90e2ed2314f59c9a (patch)
treeac06c002eaef6901ea0e084400bde1c2a0cae6ba /meta
parentfee0c6a2b3d71cfd2e145803b0cbcf0db7460751 (diff)
downloadpoky-3b534889872e6d0cc6b3ef9e90e2ed2314f59c9a.tar.gz
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
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package.bbclass41
-rw-r--r--meta/classes/siteinfo.bbclass1
-rw-r--r--meta/conf/bitbake.conf3
3 files changed, 25 insertions, 20 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 97eae6e97f..3ca8532376 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -626,25 +626,26 @@ python package_do_shlibs() {
626 626
627 #bb.note("Foo2: %s" % lafile) 627 #bb.note("Foo2: %s" % lafile)
628 #bb.note("Foo %s %s" % (file, fullpath)) 628 #bb.note("Foo %s %s" % (file, fullpath))
629 fd = open(lafile, 'r') 629 if os.path.exists(lafile):
630 lines = fd.readlines() 630 fd = open(lafile, 'r')
631 fd.close() 631 lines = fd.readlines()
632 for l in lines: 632 fd.close()
633 m = re.match("\s*dependency_libs=\s*'(.*)'", l) 633 for l in lines:
634 if m: 634 m = re.match("\s*dependency_libs=\s*'(.*)'", l)
635 deps = m.group(1).split(" ") 635 if m:
636 for dep in deps: 636 deps = m.group(1).split(" ")
637 #bb.note("Trying %s for %s" % (dep, pkg)) 637 for dep in deps:
638 name = None 638 #bb.note("Trying %s for %s" % (dep, pkg))
639 if dep.endswith(".la"): 639 name = None
640 name = os.path.basename(dep).replace(".la", "") 640 if dep.endswith(".la"):
641 elif dep.startswith("-l"): 641 name = os.path.basename(dep).replace(".la", "")
642 name = dep.replace("-l", "lib") 642 elif dep.startswith("-l"):
643 if pkg not in needed: 643 name = dep.replace("-l", "lib")
644 needed[pkg] = [] 644 if pkg not in needed:
645 if name: 645 needed[pkg] = []
646 needed[pkg].append(name) 646 if name:
647 #bb.note("Adding %s for %s" % (name, pkg)) 647 needed[pkg].append(name)
648 #bb.note("Adding %s for %s" % (name, pkg))
648 needed = {} 649 needed = {}
649 private_libs = bb.data.getVar('PRIVATE_LIBS', d, 1) 650 private_libs = bb.data.getVar('PRIVATE_LIBS', d, 1)
650 for pkg in packages.split(): 651 for pkg in packages.split():
@@ -658,7 +659,7 @@ python package_do_shlibs() {
658 for file in files: 659 for file in files:
659 soname = None 660 soname = None
660 path = os.path.join(root, file) 661 path = os.path.join(root, file)
661 if targetos == "darwin": 662 if targetos == "darwin" or targetos == "darwin8":
662 darwin_so(root, dirs, file) 663 darwin_so(root, dirs, file)
663 elif os.access(path, os.X_OK) or lib_re.match(file): 664 elif os.access(path, os.X_OK) or lib_re.match(file):
664 linux_so(root, dirs, file) 665 linux_so(root, dirs, file)
diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass
index a3b67b5798..431b81ce29 100644
--- a/meta/classes/siteinfo.bbclass
+++ b/meta/classes/siteinfo.bbclass
@@ -26,6 +26,7 @@ def get_siteinfo_list(d):
26 "armeb-linux-uclibc": "endian-big bit-32 common-uclibc arm-common",\ 26 "armeb-linux-uclibc": "endian-big bit-32 common-uclibc arm-common",\
27 "armeb-linux-uclibcgnueabi": "endian-big bit-32 common-uclibc arm-common armeb-linux-uclibc",\ 27 "armeb-linux-uclibcgnueabi": "endian-big bit-32 common-uclibc arm-common armeb-linux-uclibc",\
28 "arm-darwin": "endian-little bit-32 common-darwin",\ 28 "arm-darwin": "endian-little bit-32 common-darwin",\
29 "arm-darwin8": "endian-little bit-32 common-darwin",\
29 "arm-linux": "endian-little bit-32 common-glibc arm-common",\ 30 "arm-linux": "endian-little bit-32 common-glibc arm-common",\
30 "arm-linux-gnueabi": "endian-little bit-32 common-glibc arm-common arm-linux",\ 31 "arm-linux-gnueabi": "endian-little bit-32 common-glibc arm-common arm-linux",\
31 "arm-linux-uclibc": "endian-little bit-32 common-uclibc arm-common",\ 32 "arm-linux-uclibc": "endian-little bit-32 common-uclibc arm-common",\
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 4eca4296c8..19e4cddc55 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -162,8 +162,11 @@ MULTI_PROVIDER_WHITELIST = "virtual/libintl"
162 162
163SOLIBS = ".so.*" 163SOLIBS = ".so.*"
164SOLIBS_darwin = ".*.dylib" 164SOLIBS_darwin = ".*.dylib"
165SOLIBS_darwin8 = ".*.dylib"
166
165SOLIBSDEV = ".so" 167SOLIBSDEV = ".so"
166SOLIBSDEV_darwin = ".dylib" 168SOLIBSDEV_darwin = ".dylib"
169SOLIBSDEV_darwin8 = ".dylib"
167 170
168PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale" 171PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
169FILES = "" 172FILES = ""