diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-01-31 21:24:36 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-01-31 21:24:36 +0000 |
| commit | b20edcd38445574cbdd667d5e82fb59572e4cab2 (patch) | |
| tree | 5a52d1265144694e035f2087d0495c83b69f5c9a /classes/package.bbclass | |
| parent | 64529f883fb70f97a28cb8fe082fb7b357d509d9 (diff) | |
| parent | d8918d114e1286ff97435a543b65d270e79a0f92 (diff) | |
merge of '4ea5971c2dd26e9c357b906128f0e339d80e3d50'
and 'e651c4fa9a5d1fc6120cc2309e9cba1388cecc52'
Diffstat (limited to 'classes/package.bbclass')
| -rw-r--r-- | classes/package.bbclass | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/classes/package.bbclass b/classes/package.bbclass index 67aeb33a13..ec8c3d97e2 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -149,6 +149,12 @@ def runstrip(file, d): bb.debug(1, "runstrip: skip %s" % file) return 0 + # If the file is in a .debug directory it was already stripped, + # don't do it again... + if os.path.dirname(file).endswith(".debug"): + bb.note("Already run strip") + return 0 + strip = bb.data.getVar("STRIP", d, 1) objcopy = bb.data.getVar("OBJCOPY", d, 1) @@ -694,6 +700,16 @@ python package_do_shlibs() { for l in lines: shlib_provider[l.rstrip()] = (dep_pkg, lib_ver) + assumed_libs = bb.data.getVar('ASSUME_SHLIBS', d, 1) + if assumed_libs: + for e in assumed_libs.split(): + l, dep_pkg = e.split(":") + lib_ver = None + dep_pkg = dep_pkg.rsplit("_", 1) + if len(dep_pkg) == 2: + lib_ver = dep_pkg[1] + dep_pkg = dep_pkg[0] + shlib_provider[l] = (dep_pkg, lib_ver) for pkg in packages.split(): bb.debug(2, "calculating shlib requirements for %s" % pkg) |