diff options
Diffstat (limited to 'meta-linaro-toolchain/recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb')
| -rw-r--r-- | meta-linaro-toolchain/recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb | 84 |
1 files changed, 43 insertions, 41 deletions
diff --git a/meta-linaro-toolchain/recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb b/meta-linaro-toolchain/recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb index 2edf85e..1557d12 100644 --- a/meta-linaro-toolchain/recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb +++ b/meta-linaro-toolchain/recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb @@ -63,6 +63,7 @@ do_install() { touch ${S}/nscd/nscd.init touch ${S}/nscd/nscd.conf touch ${S}/nscd/nscd.service + touch ${S}/../makedbs.sh install -d ${D}${base_libdir} install -d ${D}${bindir} @@ -72,28 +73,28 @@ do_install() { install -d ${D}${datadir} install -d ${D}${includedir} - cp -a ${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/lib64/* ${D}${base_libdir} + cp -a -H ${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/lib64/* ${D}${base_libdir} if [ -d ${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/libc/lib64/${EAT_TARGET_SYS} ]; then - cp -a ${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/libc/lib64/${EAT_TARGET_SYS}/* ${D}${base_libdir} + cp -a -H ${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/libc/lib64/${EAT_TARGET_SYS}/* ${D}${base_libdir} else if [ -f ${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/libc/lib64/ld-${EAT_VER_LIBC}.so ]; then - cp -a ${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/libc/lib64/* ${D}${base_libdir} + cp -a -H ${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/libc/lib64/* ${D}${base_libdir} else - cp -a ${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/libc/usr/lib64/*.so* ${D}${base_libdir} + cp -a -H ${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/libc/usr/lib64/*.so* ${D}${base_libdir} fi fi if [ -d ${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/libc/usr/lib64/${EAT_TARGET_SYS} ]; then - cp -a ${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/libc/usr/lib64/${EAT_TARGET_SYS}/* ${D}${libdir} + cp -a -H ${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/libc/usr/lib64/${EAT_TARGET_SYS}/* ${D}${libdir} else - cp -a ${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/libc/usr/lib64/* ${D}${libdir} + cp -a -H ${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/libc/usr/lib64/* ${D}${libdir} if [ ! -f ${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/libc/lib64/ld-${EAT_VER_LIBC}.so ]; then rm -rf ${D}${libdir}/*.so* fi fi - cp -a ${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/libc/usr/share/* ${D}${datadir} - cp -a ${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/libc/usr/include/* ${D}${includedir} + cp -a -H ${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/libc/usr/share/* ${D}${datadir} + cp -a -H ${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/libc/usr/include/* ${D}${includedir} if [ -d ${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/libc/usr/include/${EAT_TARGET_SYS} ]; then - cp -a ${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/libc/usr/include/${EAT_TARGET_SYS}/* ${D}${includedir} + cp -a -H ${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/libc/usr/include/${EAT_TARGET_SYS}/* ${D}${includedir} rm -r ${D}${includedir}/${EAT_TARGET_SYS} fi @@ -102,40 +103,41 @@ do_install() { ln -sf ld-${EAT_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 + ln -sf ../../lib/libgcc_s.so.1 ${D}${libdir}/libgcc_s.so ln -sf ../../lib/libcrypt.so.1 ${D}${libdir}/libcrypt.so - ln -sf ../../lib/libnss_nis.so.2 ${D}${libdir}/libnss_nis.so ln -sf ../../lib/libresolv.so.2 ${D}${libdir}/libresolv.so ln -sf ../../lib/libnss_dns.so.2 ${D}${libdir}/libnss_dns.so ln -sf ../../lib/libnss_hesiod.so.2 ${D}${libdir}/libnss_hesiod.so ln -sf ../../lib/libutil.so.1 ${D}${libdir}/libutil.so ln -sf ../../lib/libnss_files.so.2 ${D}${libdir}/libnss_files.so ln -sf ../../lib/libnss_compat.so.2 ${D}${libdir}/libnss_compat.so - ln -sf ../../lib/libcidn.so.1 ${D}${libdir}/libcidn.so +# ln -sf ../../lib/libcidn.so.1 ${D}${libdir}/libcidn.so ln -sf ../../lib/libBrokenLocale.so.1 ${D}${libdir}/libBrokenLocale.so ln -sf ../../lib/libthread_db.so.1 ${D}${libdir}/libthread_db.so + ln -sf ../../lib/libtsan.so.0.0.0 ${D}${libdir}/libtsan.so.0 + ln -sf ../../lib/libtsan.so.0.0.0 ${D}${libdir}/libtsan.so + ln -sf ../../lib/libasan.so.5.0.0 ${D}${libdir}/libasan.so + ln -sf ../../lib/libasan.so.5.0.0 ${D}${libdir}/libasan.so.5.0 + ln -sf ../../lib/liblsan.so.0.0.0 ${D}${libdir}/liblsan.so + ln -sf ../../lib/liblsan.so.0.0.0 ${D}${libdir}/liblsan.so.0 ln -sf ../../lib/libpthread.so.0 ${D}${libdir}/libpthread.so ln -sf ../../lib/libthread_db.so.1 ${D}${libdir}/libthread_db-1.0.so ln -sf ../../lib/libanl.so.1 ${D}${libdir}/libanl.so ln -sf ../../lib/libdl.so.2 ${D}${libdir}/libdl.so - ln -sf ../../lib/libnss_nisplus.so.2 ${D}${libdir}/libnss_nisplus.so +# ln -sf ../../lib/libnss_nisplus.so.2 ${D}${libdir}/libnss_nisplus.so ln -sf ../../lib/libnss_db.so.2 ${D}${libdir}/libnss_db.so + ln -sf ../../lib/libnss_dns.so.2 ${D}${libdir}/libnss_dns.so + ln -sf ../../lib/libnss_files.so.2 ${D}${libdir}/libnss_files.so + ln -sf ../../lib/libnss_compat.so.2 ${D}${libdir}/libnss_compat.so ln -sf ../../lib/libm.so.6 ${D}${libdir}/libm.so ln -sf ../../lib/libatomic.so.1 ${D}${libdir}/libatomic.so ln -sf ../../lib/libgomp.so.1 ${D}${libdir}/libgomp.so ln -sf ../../lib/libitm.so.1 ${D}${libdir}/libitm.so ln -sf ../../lib/libssp.so.0 ${D}${libdir}/libssp.so ln -sf ../../lib/libstdc++.so.6 ${D}${libdir}/libstdc++.so - ln -sf ../../lib/libubsan.so.0 ${D}${libdir}/libubsan.so - if [ -f ${D}${base_libdir}/libasan.so.2 ]; then - ln -sf ../../lib/libasan.so.2 ${D}${libdir}/libasan.so - else - ln -sf ../../lib/libasan.so.1 ${D}${libdir}/libasan.so - fi - if [ -f ${D}${base_libdir}/libgfortran.so.6 ]; then - ln -sf ../../lib/libgfortran.so.6 ${D}${libdir}/libgfortran.so - else - ln -sf ../../lib/libgfortran.so.3 ${D}${libdir}/libgfortran.so - fi + ln -sf ../../lib/libubsan.so.1.0 ${D}${libdir}/libubsan.so + # ln -sf ../../lib/libasan.so.1 ${D}${libdir}/libasan.so + ln -sf ../../lib/libgfortran.so.5 ${D}${libdir}/libgfortran.so # remove potential .so duplicates from base_libdir # for all symlinks created above in libdir @@ -149,7 +151,7 @@ do_install() { rm -f ${D}${base_libdir}/libutil.so rm -f ${D}${base_libdir}/libnss_files.so rm -f ${D}${base_libdir}/libnss_compat.so - rm -f ${D}${base_libdir}/libcidn.so +# rm -f ${D}${base_libdir}/libcidn.so rm -f ${D}${base_libdir}/libBrokenLocale.so rm -f ${D}${base_libdir}/libthread_db.so rm -f ${D}${base_libdir}/libanl.so @@ -194,25 +196,20 @@ do_install() { rm -rf ${D}${base_libdir}/ldscripts fi - if [ -f ${D}${libdir}/libc.so ];then - sed -i -e "s# /lib64/${EAT_TARGET_SYS}# ../../lib64#g" -e "s# /usr/lib64/# /usr/lib/#g" -e "s# /usr/lib64/${EAT_TARGET_SYS}# .#g" -e "s# /lib64/ld-linux# ../../lib64/ld-linux#g" ${D}${libdir}/libc.so + if [ -f ${D}${libdir}/libc.so ];then + sed -i -e "s# /lib64/${EAT_TARGET_SYS}# ../../lib64#g" -e "s# /usr/lib64/# /usr/lib/#g" -e "s# /usr/lib64/${EAT_TARGET_SYS}# .#g" -e "s# /lib64/ld-linux# ../../lib64/ld-linux#g" ${D}${libdir}/libc.so sed -i -e "s# /lib64/libc.so.6# /lib/libc.so.6#g" ${D}${libdir}/libc.so # cat kjasdkjasd - fi + fi + if [ -f ${D}${base_libdir}/libc.so ];then - sed -i -e "s# /lib64/${EAT_TARGET_SYS}# ../../lib64#g" -e "s# /usr/lib64/${EAT_TARGET_SYS}# .#g" ${D}${base_libdir}/libc.so + sed -i -e "s# /lib64/${EAT_TARGET_SYS}# ../../lib#g" -e "s# /usr/lib64/${EAT_TARGET_SYS}# .#g" "s# /lib64/# /lib/#g" ${D}${base_libdir}/libc.so if [ -f ${D}${base_libdir}/libc.so.6 ]; then - sed -i -e "s# /usr/lib64/libc.so.6# /lib/libc.so.6#g" ${D}${base_libdir}/libc.so.6 + sed -i -e "s# /usr/lib64/libc.so.6# /lib/libc.so.6#g" "s# /lib64/libc.so.6# /lib/libc.so.6#g" ${D}${base_libdir}/libc.so.6 fi fi - if [ -f ${D}${libdir}/libpthread.so ];then - sed -i -e "s# /lib64/${EAT_TARGET_SYS}# ../../lib#g" -e "s# /usr/lib/${EAT_TARGET_SYS}# .#g" ${D}${libdir}/libpthread.so - fi - if [ -f ${D}${base_libdir}/libpthread.so ];then - sed -i -e "s# /lib64/${EAT_TARGET_SYS}# ../../lib64#g" -e "s# /usr/lib64/${EAT_TARGET_SYS}# .#g" ${D}${base_libdir}/libpthread.so - if [ -f ${D}${base_libdir}/libpthread.so.0 ]; then - sed -i -e "s# /usr/lib64/libpthread.so.0# /lib/libpthread.so.0#g" ${D}${base_libdir}/libpthread.so - fi + if [ -f ${D}${base_libdir}/libpthread.so.0 ]; then + sed -i -e "s# /usr/lib64/libpthread.so.0# /lib/libpthread.so.0#g" ${D}${base_libdir}/libpthread.so.0 fi # Remove if empty @@ -288,7 +285,9 @@ INSANE_SKIP_${PN}-dbg = "staticdev" INSANE_SKIP_${PN}-utils += "ldflags" INSANE_SKIP_libstdc++ += "ldflags" INSANE_SKIP_libgfortran += "ldflags" -INSANE_SKIP_libgcc += "ldflags" +INSANE_SKIP_libgcc += "ldflags dev-deps" +INSANE_SKIP_libgfortran += "ldflags dev-deps" +INSANE_SKIP_libstdc++ += "ldflags dev-deps" INSANE_SKIP_libatomic += "ldflags" INSANE_SKIP_libasan += "ldflags" INSANE_SKIP_libubsan += "ldflags" @@ -335,7 +334,8 @@ PKGV_${PN}-staticdev = "${EAT_VER_LIBC}" PKGV_catchsegv = "${EAT_VER_LIBC}" PKGV_glibc-extra-nss = "${EAT_VER_LIBC}" PKGV_glibc-thread-db = "${EAT_VER_LIBC}" -PKGV_libcidn = "${EAT_VER_LIBC}" +# PKGV_libcidn = "${EAT_VER_LIBC}" + PKGV_libmemusage = "${EAT_VER_LIBC}" PKGV_libsegfault = "${EAT_VER_LIBC}" PKGV_libsotruss = "${EAT_VER_LIBC}" @@ -449,7 +449,7 @@ FILES_libtsan-dev = "\ FILES_libtsan-staticdev = "${base_libdir}/libtsan.a" FILES_libgcc = "${base_libdir}/libgcc_s.so.1" -FILES_libgcc-dev = "${base_libdir}/libgcc_s.so" +FILES_libgcc-dev = "${libdir}/libgcc_s.so" FILES_linux-libc-headers = "\ ${includedir}/asm* \ @@ -475,6 +475,7 @@ FILES_${PN} += "\ ${base_libdir}/ld*.so.* \ ${base_libdir}/ld-*.so \ ${base_libdir}/libpthread*.so.* \ + ${base_libdir}/libpthread*.so \ ${base_libdir}/libpthread-*.so \ ${base_libdir}/libresolv*.so.* \ ${base_libdir}/libresolv-*.so \ @@ -502,7 +503,6 @@ FILES_${PN} += "\ ${base_libdir}/libanl-*.so \ ${base_libdir}/libBrokenLocale*.so.* \ ${base_libdir}/libBrokenLocale-*.so \ - ${base_libdir}/libcidn*.so.* \ ${base_libdir}/libcidn-*.so \ ${base_libdir}/libthread_db*.so.* \ ${base_libdir}/libthread_db-*.so \ @@ -510,6 +510,7 @@ FILES_${PN} += "\ ${base_libdir}/libSegFault.so \ ${base_libdir}/libpcprofile.so \ " +# ${base_libdir}/libcidn*.so.* FILES_${PN}-dbg += "${base_libdir}/debug" @@ -572,6 +573,7 @@ FILES_libgomp-staticdev = "\ " EAT_VER_MAIN ??= "" + python () { if not d.getVar("EAT_VER_MAIN", False): raise bb.parse.SkipPackage("External ARM toolchain not configured (EAT_VER_MAIN not set).") |