fb2dfe7ac8
Bug fixing [YOCTO #1236]. 1. Collect all the values for RTLDLIST for the current multilib configuration to modify the ldd scripts. 2. Collect all the values for KNOWN_INTERPRETER_NAMES for the current multilib configuration. Set the correct ld.so names for ldconfig to deal with the multilib configuration. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
55 lines
2.2 KiB
PHP
55 lines
2.2 KiB
PHP
def ld_append_if_tune_exists(d, infos, dict):
|
|
tune = d.getVar("DEFAULTTUNE", True) or ""
|
|
libdir = d.getVar("base_libdir", True) or ""
|
|
if dict.has_key(tune):
|
|
infos['ldconfig'].add('{"' + libdir + '/' + dict[tune][0] + '",' + dict[tune][1] + ' }')
|
|
infos['lddrewrite'].add(libdir+'/'+dict[tune][0])
|
|
|
|
def eglibc_dl_info(d):
|
|
ld_info_all = {
|
|
"mips": ["ld.so.1", "FLAG_ELF_LIBC6"],
|
|
"mips64-n32": ["ld.so.1", "FLAG_ELF_LIBC6"],
|
|
"mips64": ["ld.so.1", "FLAG_ELF_LIBC6"],
|
|
"mipsel": ["ld.so.1", "FLAG_ELF_LIBC6"],
|
|
"mips64el-n32": ["ld.so.1", "FLAG_ELF_LIBC6"],
|
|
"mips64el": ["ld.so.1", "FLAG_ELF_LIBC6"],
|
|
"mips-nf": ["ld.so.1", "FLAG_ELF_LIBC6"],
|
|
"mips64-nf-n32": ["ld.so.1", "FLAG_ELF_LIBC6"],
|
|
"mips64-nf": ["ld.so.1", "FLAG_ELF_LIBC6"],
|
|
"mips64el-nf-n32": ["ld.so.1", "FLAG_ELF_LIBC6"],
|
|
"mips64el-nf": ["ld.so.1", "FLAG_ELF_LIBC6"],
|
|
"powerpc": ["ld.so.1", "FLAG_ELF_LIBC6"],
|
|
"powerpc-nf": ["ld.so.1", "FLAG_ELF_LIBC6"],
|
|
"powerpc64": ["ld64.so.1", "FLAG_ELF_LIBC6"],
|
|
"powerpc64-nf": ["ld64.so.1", "FLAG_ELF_LIBC6"],
|
|
"core2": ["ld-linux.so.2", "FLAG_ELF_LIBC6"],
|
|
"core2-64": ["ld-linux-x86-64.so.2", "FLAG_ELF_LIBC6"],
|
|
"x86": ["ld-linux.so.2", "FLAG_ELF_LIBC6"],
|
|
"x86-64": ["ld-linux-x86-64.so.2", "FLAG_ELF_LIBC6"],
|
|
"i586": ["ld-linux.so.2", "FLAG_ELF_LIBC6"],
|
|
}
|
|
|
|
infos = {'ldconfig':set(), 'lddrewrite':set()}
|
|
ld_append_if_tune_exists(d, infos, ld_info_all)
|
|
|
|
#DEFAULTTUNE_MULTILIB_ORIGINAL
|
|
original_tune=d.getVar("DEFAULTTUNE_MULTILIB_ORIGINAL",True)
|
|
if original_tune:
|
|
localdata = bb.data.createCopy(d)
|
|
localdata.setVar("DEFAULTTUNE", original_tune)
|
|
ld_append_if_tune_exists(localdata, infos, ld_info_all)
|
|
|
|
variants = d.getVar("MULTILIB_VARIANTS", True) or ""
|
|
for item in variants.split():
|
|
localdata = bb.data.createCopy(d)
|
|
overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item
|
|
localdata.setVar("OVERRIDES", overrides)
|
|
bb.data.update_data(localdata)
|
|
ld_append_if_tune_exists(localdata, infos, ld_info_all)
|
|
infos['ldconfig'] = ','.join(infos['ldconfig'])
|
|
infos['lddrewrite'] = ' '.join(infos['lddrewrite'])
|
|
return infos
|
|
|
|
EGLIBC_KNOWN_INTERPRETER_NAMES = "${@eglibc_dl_info(d)['ldconfig']}"
|
|
RTLDLIST = "${@eglibc_dl_info(d)['lddrewrite']}"
|