From ef8a54e6811ae965e0433684c2631031aa9c360e Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Fri, 31 Oct 2014 15:59:22 -0700 Subject: [PATCH 1/2] external-sourcery-toolchain: add libgcov This is needed to avoid the real libgcc being pulled in by packagegroup-core-standalone-sdk-target when building an SDK. Signed-off-by: Christopher Larson --- recipes/meta/external-sourcery-toolchain.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes/meta/external-sourcery-toolchain.bb b/recipes/meta/external-sourcery-toolchain.bb index 2428afd..5a7c3ac 100644 --- a/recipes/meta/external-sourcery-toolchain.bb +++ b/recipes/meta/external-sourcery-toolchain.bb @@ -145,6 +145,7 @@ external_toolchain_sysroot_adjust() { } TC_PACKAGES =+ "libgcc libgcc-dev" +TC_PACKAGES =+ "libgcov libgcov-dev" TC_PACKAGES =+ "libgomp libgomp-dev libgomp-staticdev" TC_PACKAGES =+ "libquadmath libquadmath-dev libquadmath-staticdev" TC_PACKAGES =+ "libstdc++ libstdc++-dev libstdc++-staticdev" @@ -166,6 +167,9 @@ FILES_${PN}-dev += "${@sysroot_multilib_suffix(d)}" FILES_${PN} += "${prefix}/libexec/*" FILES_${PN}-dbg += "${prefix}/libexec/*/.debug" +FILES_libgcov = "${libdir}/libgcov.so.*" +FILES_libgcov-dev = "${libdir}/libgcov.so" + SUMMARY_libasan = "The Address Sanitizer runtime library" SUMMARY_libasan-dev = "${SUMMARY_libasan} - development files" FILES_libasan = "${libdir}/libasan.so.*" From c9e4b593afe1f3c23672c89d8bccc93093ff5bc4 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Fri, 31 Oct 2014 20:31:56 -0700 Subject: [PATCH 2/2] tcmode: don't set SDKGCCVERSION There's no need for the crosssdk and nativesdk gcc bits to be the same version as the external toolchain. JIRA: SB-3919 Signed-off-by: Christopher Larson --- conf/distro/include/tcmode-external-sourcery.inc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/conf/distro/include/tcmode-external-sourcery.inc b/conf/distro/include/tcmode-external-sourcery.inc index dddbb6e..14f324c 100644 --- a/conf/distro/include/tcmode-external-sourcery.inc +++ b/conf/distro/include/tcmode-external-sourcery.inc @@ -213,9 +213,3 @@ def get_gcc_version_prefix(d): GCCVERSION ?= "${@get_gcc_version_prefix(d)}%" BUILDCFG_VARS += "CSL_VER_MAIN EXTERNAL_TOOLCHAIN" -SDKGCCVERSION ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-crosssdk ?= "${SDKGCCVERSION}" -PREFERRED_VERSION_gcc-crosssdk-initial ?= "${SDKGCCVERSION}" -PREFERRED_VERSION_gcc-crosssdk-intermediate ?= "${SDKGCCVERSION}" -PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}" -PREFERRED_VERSION_nativesdk-libgcc ?= "${SDKGCCVERSION}"