From: Patrick Ohly <patrick.ohly@intel.com>
To: openembedded-core@lists.openembedded.org
Date: Thu,  1 Oct 2015 11:53:02 +0200
Message-Id: <1443693182-25212-1-git-send-email-patrick.ohly@intel.com>
Subject: [meta-java] [PATCH] openjdk-8: fix TUNE_CCARGS on intel-core2-32/i686
Precedence: list

A machine-independent recipe must not have machine-specific changes,
as in TUNE_CCARGS_append_intel-core2-32. In the best case, that only
causes unnecessary rebuilds when switching machines with the same CPU
which otherwise could share sstate. In the worst case, it confuses PR
server and build history such that building fails with "version going
backwards".

There are not tune-specific overrides, so a Python snippet is used to
apply the additional parameters on all machines with the same
TUNE_ARCH as intel-core2-32 (like for example edison).

Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
---
 recipes-core/openjdk/openjdk-8_60b27-2.5.4.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes-core/openjdk/openjdk-8_60b27-2.5.4.bb b/recipes-core/openjdk/openjdk-8_60b27-2.5.4.bb
index 6a95dd2..329933e 100644
--- a/recipes-core/openjdk/openjdk-8_60b27-2.5.4.bb
+++ b/recipes-core/openjdk/openjdk-8_60b27-2.5.4.bb
@@ -58,7 +58,8 @@ export CACAO_CONFIGURE_ARGS = " \
 
 JAVA_HOME[unexport] = "1"
 
-TUNE_CCARGS_append_intel-core2-32 = " -mstackrealign -fno-omit-frame-pointer "
+# For intel-core2-32 and Edison.
+TUNE_CCARGS_append = "${@' -mstackrealign -fno-omit-frame-pointer' if '${TUNE_ARCH}' == 'i686' else ''}"
 
 # disable shark until it is fully working again
 # WITH_ADDITIONAL_VMS ?= "--with-additional-vms=shark,cacao,jamvm"
-- 
2.1.4