From 1c5fb74ad7f5ec83578eecdc1180d24b840bdb1c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 4 Oct 2012 10:37:05 +0000 Subject: tune-xscale: replace TUNE_CCARGS for webkit-gtk and cairo only with xscale in TUNE_FEATURES * without this you'll get different sstate checksum for webkit-gtk and cairo even when you build them with DEFAULTTUNE == armv5te * maybe this isn't needed at all anymore or if it is then it should be applied in arm-armv5.inc for all armv5te devices, not only xscale? (From OE-Core rev: c51643a510da6d1c3426b3de8f18ae864cb073a4) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/conf/machine/include/tune-xscale.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/machine/include/tune-xscale.inc b/meta/conf/machine/include/tune-xscale.inc index 80a3683666..0d5d060d04 100644 --- a/meta/conf/machine/include/tune-xscale.inc +++ b/meta/conf/machine/include/tune-xscale.inc @@ -15,5 +15,5 @@ PACKAGE_EXTRA_ARCHS_tune-xscale-be = "${PACKAGE_EXTRA_ARCHS_tune-armv5teb}" # webkit-gtk has alignment issues with double instructions on armv5 so # disable them here -TUNE_CCARGS_pn-webkit-gtk = "-march=armv4t" -TUNE_CCARGS_pn-cairo = "-march=armv4t" +TUNE_CCARGS_pn-webkit-gtk = "${@bb.utils.contains("TUNE_FEATURES", "xscale", "-march=armv4t", "", d)}" +TUNE_CCARGS_pn-cairo = "${@bb.utils.contains("TUNE_FEATURES", "xscale", "-march=armv4t", "", d)}" -- cgit v1.2.3-54-g00ecf