package_do_shlibs: Look for provider in the path thats in shlib_provider dictionary
shlib2 code puts the information about path where a provider will be found. e.g. {'/usr/lib/llvm3.3': ('libllvm3.3-llvm-3.3', '3.3')} This is obtained from new shlib2 pkgdata from llvm3.3/3.3-r0/pkgdata/shlibs2/libllvm3.3-llvm-3.3.list However when we search for NEEDED libraries we ignore the key above which is the path where the provider library is installed and instead just seach in libdir and base_libdir and hence libraries which are not in above standard search paths gets ignored even if they appear in DT_NEEDED sections and a note is emitted NOTE: Couldn't find shared library provider for libLLVM-3.3.so, used by files: .... IMO this note should actually become an error since if we do not have all DT_NEEDED libraries in image the system is dysfunctional. This patch extracts this libpath from key and add it to seach paths when looing for a provider of a shared library [YOCTO #6798] Change-Id: Ie5f08632e37ba8d3439c8aaae33bc68b8996792f (From OE-Core rev: bf8472274ac1e9a35f8cbc82357da6c95b396759) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
e495d9ce53
commit
b2f1250f6d
|
@ -1572,8 +1572,11 @@ python package_do_shlibs() {
|
|||
bb.debug(2, '%s: Dependency %s covered by PRIVATE_LIBS' % (pkg, n[0]))
|
||||
continue
|
||||
if n[0] in shlib_provider.keys():
|
||||
shlib_provider_path = list()
|
||||
for k in shlib_provider[n[0]].keys():
|
||||
shlib_provider_path.append(k)
|
||||
match = None
|
||||
for p in n[2] + libsearchpath:
|
||||
for p in n[2] + shlib_provider_path + libsearchpath:
|
||||
if p in shlib_provider[n[0]]:
|
||||
match = p
|
||||
break
|
||||
|
|
Loading…
Reference in New Issue