Skip to contentSkip to conversation

openjdk-8: fix TUNE_CCARGS on intel-core2-32/i686

PATCH New Patrick Ohly 1 participant 1 message Oct 1, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 openjdk-8: fix TUNE_CCARGS on intel-core2-32/i686

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).

---
 recipes-core/openjdk/openjdk-8_60b27-2.5.4.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
recipes-core/openjdk/openjdk-8_60b27-2.5.4.bb +2 -1
index 6a95dd2..329933e 100644
@@ -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"
Signature · 1 line
2.1.4