summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel McGregor <daniel.mcgregor@vecima.com>2016-07-07 10:55:18 -0600
committerOtavio Salvador <otavio@ossystems.com.br>2016-07-18 10:37:49 -0300
commitdcef9ff46b9dc6f718cf2e63d48842dd0236bed1 (patch)
treeec0dcc994a72073a93b0d3dc0f23bd8596173879
parent33fbcd43cae1b9c08704792547159d27f2fdbe50 (diff)
downloadmeta-java-dcef9ff46b9dc6f718cf2e63d48842dd0236bed1.tar.gz
openjdk-7, openjdk-8: use vardeps to fix shared state
Previously if PARALLEL_MAKE changed, so did the task signature for do_configure. Use vardepsvalue so that the signature remains constant. Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
-rw-r--r--recipes-core/openjdk/openjdk-7-common.inc1
-rw-r--r--recipes-core/openjdk/openjdk-8-common.inc2
2 files changed, 3 insertions, 0 deletions
diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc
index bb399b1..759b426 100644
--- a/recipes-core/openjdk/openjdk-7-common.inc
+++ b/recipes-core/openjdk/openjdk-7-common.inc
@@ -80,6 +80,7 @@ def get_jdk7_jobs(d):
80 # Whatever found in PARALLEL_MAKE was not suitable. 80 # Whatever found in PARALLEL_MAKE was not suitable.
81 return "1" 81 return "1"
82 82
83get_jdk7_jobs[vardepsexclude] += "OPENJDK_PARALLEL_MAKE"
83JDK_JOBS = "${@get_jdk7_jobs(d)}" 84JDK_JOBS = "${@get_jdk7_jobs(d)}"
84 85
85EXTRA_OECONF = " \ 86EXTRA_OECONF = " \
diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc
index dd3d397..74f686d 100644
--- a/recipes-core/openjdk/openjdk-8-common.inc
+++ b/recipes-core/openjdk/openjdk-8-common.inc
@@ -186,6 +186,8 @@ def get_jdk8_native_jobs(d):
186 # Whatever found in PARALLEL_MAKE was not suitable. 186 # Whatever found in PARALLEL_MAKE was not suitable.
187 return "1" 187 return "1"
188 188
189get_jdk8_native_jobs[vardepsexclude] += "OPENJDK8_PARALLEL_MAKE"
190
189# A function that is needed in the Shark builds. 191# A function that is needed in the Shark builds.
190def get_llvm_configure_arch(d): 192def get_llvm_configure_arch(d):
191 import bb; 193 import bb;