From 6e379bfb8e94425ebdd8bdb6a47025389fddab3c Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 19 Sep 2023 09:22:22 +0800 Subject: gcc-crosssdk: ignore MULTILIB_VARIANTS in signature computation The gcc_multilib_setup function is a function that is run at the do_configure step, so it's counted into the signature computation. The MULTILIB_VARIANTS this function uses is also extracted to be taken into consideration. After the change of setting MULTILIB_VARIANTS explictly vardeps on MULTILIBS, the change of MULTILIBS changes the signature, thus causing rebuilding. However, in case of gcc-crosssdk, the setting of multilib should have no effect on it, as it's used to build nativesdk packages, not the target packages. So ignore MULTILIB_VARIANTS in signature computation. This fixes oe-selftest case sstatetests.SStateHashSameSigs2.test_sstate_nativesdk_samesigs_multilib. (From OE-Core rev: 537c71162a711dec32a63a657c4b101269a3e267) (From OE-Core rev: 6b87f7c9e955abe5833820ee7eda9d525c77d2ea) Signed-off-by: Chen Qi Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- meta/recipes-devtools/gcc/gcc-crosssdk.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk.inc b/meta/recipes-devtools/gcc/gcc-crosssdk.inc index bd2e71d63f..74c4537f4f 100644 --- a/meta/recipes-devtools/gcc/gcc-crosssdk.inc +++ b/meta/recipes-devtools/gcc/gcc-crosssdk.inc @@ -10,3 +10,5 @@ GCCMULTILIB = "--disable-multilib" DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk gettext-native ${NATIVEDEPS}" PROVIDES = "virtual/${TARGET_PREFIX}gcc-crosssdk virtual/${TARGET_PREFIX}g++-crosssdk" + +gcc_multilib_setup[vardepsexclude] = "MULTILIB_VARIANTS" -- cgit v1.2.3-54-g00ecf