From: Mark Hatle Date: Thu, 15 Jan 2015 15:05:33 +0000 (-0600) Subject: arch-mips.inc: Add the MIPS ABIEXTENSION to toolchain name X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~31538 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bcc01121e928d0be7a0550e500425852c63cf98;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git arch-mips.inc: Add the MIPS ABIEXTENSION to toolchain name [YOCTO #7143] When the system is configured for a multilib SDK, such as: require conf/multilib.conf MULTILIBS = "multilib:lib32 multilib:lib64" DEFAULTTUNE = "mips32r2" DEFAULTTUNE_virtclass-multilib-lib32 = "mips64-n32" DEFAULTTUNE_virtclass-multilib-lib64 = "mips64" Only one of the mips64-n32 or mips64 toolchains is built. Causing the other to be unavailable. This is due to both recipes ending up with the same PN. The toolchain uses the TRANSLATED_TARGET_ARCH in it's name, however the target for mips64 and mips64 n32 were the same, causing the conflict. Avoid this conflict by adding the ABIEXTENSION to the name. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- diff --git a/meta/conf/machine/include/mips/arch-mips.inc b/meta/conf/machine/include/mips/arch-mips.inc index 02626d300e9..08d8fdc76f7 100644 --- a/meta/conf/machine/include/mips/arch-mips.inc +++ b/meta/conf/machine/include/mips/arch-mips.inc @@ -100,3 +100,5 @@ TUNE_FEATURES_tune-mips64el-nf = "n64" BASE_LIB_tune-mips64el-nf = "lib64" MIPSPKGSFX_VARIANT_tune-mips64el-nf = "${TUNE_ARCH}" PACKAGE_EXTRA_ARCHS_tune-mips64el-nf = "mips64el-nf" + +TRANSLATED_TARGET_ARCH_append = "${ABIEXTENSION}"