diff options
| author | Fathi Boudra <fathi.boudra@linaro.org> | 2014-06-16 13:41:13 +0000 |
|---|---|---|
| committer | Linaro Code Review <review@review.linaro.org> | 2014-06-16 13:41:13 +0000 |
| commit | bd4e33e78f925afb0c6e9d1ad2ba5d712d9163dd (patch) | |
| tree | 086f64290b119f7dde8ad020a6dc6bf810a9d889 | |
| parent | 69a29eff6e88c39b1d06296127aee5db6ffbbf06 (diff) | |
| parent | ab3610aefa2786e3172e751c0ae5e5f560e37444 (diff) | |
Merge "external-toolchain: fix issues with ld-linux linker/loader in OE sysroot"
| -rw-r--r-- | meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb b/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb index 240d5507..06abb7af 100644 --- a/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb +++ b/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb @@ -45,7 +45,7 @@ PROVIDES += "\ " PV = "${ELT_VER_MAIN}" -PR = "r2" +PR = "r3" # https://launchpad.net/linaro-toolchain-binaries SRC_URI = "file://SUPPORTED" @@ -79,7 +79,7 @@ do_install() { fi # fix up the copied symlinks (they are still pointing to the multiarch directory) - linker_name="${@base_contains("TUNE_FEATURES", "aarch64", "ld-linux-aarch64.so.1", "ld-linux.so.3",d)}" + linker_name="${@base_contains("TUNE_FEATURES", "aarch64", "ld-linux-aarch64.so.1", base_contains("TUNE_FEATURES", "callconvention-hard", "ld-linux-armhf.so.3", "ld-linux.so.3",d), d)}" ln -sf ld-${ELT_VER_LIBC}.so ${D}${base_libdir}/${linker_name} ln -sf ../../lib/libnsl.so.1 ${D}${libdir}/libnsl.so ln -sf ../../lib/librt.so.1 ${D}${libdir}/librt.so @@ -108,10 +108,10 @@ do_install() { fi if [ -f ${D}${libdir}/libc.so ];then - sed -i -e "s# /lib/${ELT_TARGET_SYS}# ../../lib#g" -e "s# /usr/lib/${ELT_TARGET_SYS}# .#g" ${D}${libdir}/libc.so + sed -i -e "s# /lib/${ELT_TARGET_SYS}# ../../lib#g" -e "s# /usr/lib/${ELT_TARGET_SYS}# .#g" -e "s# /lib/ld-linux# ../../lib/ld-linux#g" ${D}${libdir}/libc.so fi if [ -f ${D}${base_libdir}/libc.so ];then - sed -i -e "s# /lib/${ELT_TARGET_SYS}# ../../lib#g" -e "s# /usr/lib/${ELT_TARGET_SYS}# .#g" ${D}${base_libdir}/libc.so + sed -i -e "s# /lib/${ELT_TARGET_SYS}# ../../lib#g" -e "s# /usr/lib/${ELT_TARGET_SYS}# .#g" -e "s# /lib/ld-linux# ../../lib/ld-linux#g" ${D}${base_libdir}/libc.so fi if [ -f ${D}${libdir}/libpthread.so ];then sed -i -e "s# /lib/${ELT_TARGET_SYS}# ../../lib#g" -e "s# /usr/lib/${ELT_TARGET_SYS}# .#g" ${D}${libdir}/libpthread.so |