diff options
| author | Khem Raj <raj.khem@gmail.com> | 2014-11-21 10:05:03 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-31 10:17:34 +0000 |
| commit | b143340700961f916e4a21da42b859ec014dd366 (patch) | |
| tree | bd05a1f887aaa7e271ec14dcf62e0bce729db8a1 /meta/classes | |
| parent | 10a1ae28ecee10695efb6a5bc08de4f04e0acac1 (diff) | |
| download | openembedded-core-b143340700961f916e4a21da42b859ec014dd366.tar.gz openembedded-core-b143340700961f916e4a21da42b859ec014dd366.tar.bz2 openembedded-core-b143340700961f916e4a21da42b859ec014dd366.zip | |
package.bbclass: Create empty key/value if not there for shlib_provider
When we use ASSUME_SHLIBS,e.g.
ASSUME_SHLIBS = "libEGL.so.1:libegl-implementation"
then we end up with errors like below when using shlibs2 (dizzy+)
File: 'package_do_shlibs', lineno: 216, function: package_do_shlibs
0212: dep_pkg = dep_pkg.rsplit("_", 1)
0213: if len(dep_pkg) == 2:
0214: lib_ver = dep_pkg[1]
0215: dep_pkg = dep_pkg[0]
*** 0216: shlib_provider[l][libdir] = (dep_pkg, lib_ver)
0217:
0218: libsearchpath = [d.getVar('libdir', True),
d.getVar('base_libdir', True)]
0219:
0220: for pkg in packages.split():
Exception: KeyError: 'libEGL.so.1'
This is because the entry which is being populated does not exist
so lets create it if its not already there.
Change-Id: I9e292c5439e5d1e01ea48341334507aacc3784ae
(From OE-Core rev: a64f81fcef42172f788cec7a63bb4672eac99f94)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/package.bbclass | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 2aec3e6bd9..696d173ced 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1554,6 +1554,8 @@ python package_do_shlibs() { if len(dep_pkg) == 2: lib_ver = dep_pkg[1] dep_pkg = dep_pkg[0] + if l not in shlib_provider: + shlib_provider[l] = {} shlib_provider[l][libdir] = (dep_pkg, lib_ver) libsearchpath = [d.getVar('libdir', True), d.getVar('base_libdir', True)] |