aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSumit Garg <sumit.garg@linaro.org>2019-12-20 15:54:06 +0530
committerSumit Garg <sumit.garg@linaro.org>2020-01-02 16:02:27 +0530
commit3a030886ffbd6b7d6bb9883962ebc5f9a952dde2 (patch)
treeac81f0fbe5c96c331d48a68d2147418ddf0329b9
parenta676d70fdedd77d798e41c5b4935561cf4b563dc (diff)
downloadmeta-linaro-3a030886ffbd6b7d6bb9883962ebc5f9a952dde2.tar.gz
external-arm-toolchain: fixes for static-libs and headers
- Provide libgcov-staticdev instead of libgcov-dev as external toolchain provides libgcov.a only. - Remove installation of static libs like libgcc.a etc which aren't packaged as per existing OE recipes. - Package libgcc headers. Signed-off-by: Sumit Garg <sumit.garg@linaro.org> Change-Id: I72bb0a48855b457c263e159e3a9b67fc4ea665bc
-rw-r--r--meta-linaro-toolchain/recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb12
1 files changed, 5 insertions, 7 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 761f9fbd..f6827e91 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
@@ -50,7 +50,7 @@ PROVIDES += "\
libquadmath-dev \
libquadmath-staticdev \
virtual/linux-libc-headers \
- libgcov-dev \
+ libgcov-staticdev \
virtual/libc-locale \
"
@@ -116,13 +116,10 @@ do_install() {
sed -i -e 's#/arm/tools/gnu/bash/4.2/rhe6-x86_64##' ${D}${bindir}/ldd
cp ${CP_ARGS} -H ${EXTERNAL_TOOLCHAIN}/lib/gcc/${EAT_TARGET_SYS}/${EAT_VER_GCC}/crt*.o ${D}${libdir}/${EAT_TARGET_SYS}/${EAT_VER_GCC}/
- cp ${CP_ARGS} -H ${EXTERNAL_TOOLCHAIN}/lib/gcc/${EAT_TARGET_SYS}/${EAT_VER_GCC}/libgcc* ${D}${libdir}/${EAT_TARGET_SYS}/${EAT_VER_GCC}/
- cp ${CP_ARGS} -H ${EXTERNAL_TOOLCHAIN}/lib/gcc/${EAT_TARGET_SYS}/${EAT_VER_GCC}/libgcov* ${D}${libdir}/${EAT_TARGET_SYS}/${EAT_VER_GCC}/
+ cp ${CP_ARGS} -H ${EXTERNAL_TOOLCHAIN}/lib/gcc/${EAT_TARGET_SYS}/${EAT_VER_GCC}/libgcov* ${D}${libdir}/gcc/${EAT_TARGET_SYS}/${EAT_VER_GCC}/
cp ${CP_ARGS} -H ${EXTERNAL_TOOLCHAIN}/lib/gcc/${EAT_TARGET_SYS}/${EAT_VER_GCC}/include ${D}${libdir}/gcc/${EAT_TARGET_SYS}/${EAT_VER_GCC}/
cp ${CP_ARGS} -H ${EXTERNAL_TOOLCHAIN}/lib/gcc/${EAT_TARGET_SYS}/${EAT_VER_GCC}/finclude ${D}${libdir}/gcc/${EAT_TARGET_SYS}/${EAT_VER_GCC}/
- cp ${CP_ARGS} -H ${EXTERNAL_TOOLCHAIN}/lib/gcc/${EAT_TARGET_SYS}/${EAT_VER_GCC}/libgfortranbegin.* ${D}${libdir}/gcc/${EAT_TARGET_SYS}/${EAT_VER_GCC}/ || true
- cp ${CP_ARGS} -H ${EXTERNAL_TOOLCHAIN}/lib/gcc/${EAT_TARGET_SYS}/${EAT_VER_GCC}/libcaf_single* ${D}${libdir}/gcc/${EAT_TARGET_SYS}/${EAT_VER_GCC}/
# fix up the copied symlinks (they are still pointing to the multiarch directory)
linker_name="${@bb.utils.contains("TUNE_FEATURES", "aarch64", "ld-linux-aarch64.so.1", bb.utils.contains("TUNE_FEATURES", "callconvention-hard", "ld-linux-armhf.so.3", "ld-linux.so.3",d), d)}"
@@ -322,7 +319,7 @@ PACKAGES += "\
PACKAGES =+ "\
${PN}-mtrace \
- libgcov-dev \
+ libgcov-staticdev \
linux-libc-headers \
linux-libc-headers-dev \
"
@@ -441,7 +438,7 @@ PKGV_gdbserver = "${EAT_VER_GDBSERVER}"
ALLOW_EMPTY_${PN}-mtrace = "1"
FILES_${PN}-mtrace = "${bindir}/mtrace"
-FILES_libgcov-dev = "${libdir}/${TARGET_SYS}/${BINV}/libgcov.a"
+FILES_libgcov-staticdev = "${libdir}/gcc/${TARGET_SYS}/${BINV}/libgcov.a"
FILES_libsegfault = "${base_libdir}/libSegFault*"
@@ -512,6 +509,7 @@ FILES_libgcc-dev = "\
${@oe.utils.conditional('BASETARGET_SYS', '${TARGET_SYS}', '', '${libdir}/${BASETARGET_SYS}', d)} \
${libdir}/${TARGET_SYS}/${BINV}* \
${libdir}/${TARGET_ARCH}${TARGET_VENDOR}* \
+ ${libdir}/gcc/${TARGET_SYS}/${BINV}/include \
"
FILES_linux-libc-headers = ""