diff options
author | Kyle Russell <bkylerussell@gmail.com> | 2016-08-24 09:28:40 -0400 |
---|---|---|
committer | Maxin B. John <maxin.john@intel.com> | 2016-08-30 16:49:09 +0300 |
commit | 8c663efa4f8efccf50d094dbc61c7b78031b3b7d (patch) | |
tree | d002a12d3fc2167d960fdf85dcb196847ed1c370 /recipes-core/openjdk/openjdk-8-cross.inc | |
parent | b2827bf00734331fa6776909e2bfee8f94790fda (diff) | |
download | meta-java-8c663efa4f8efccf50d094dbc61c7b78031b3b7d.tar.gz |
Reimplement helper method for parallelizing JDK builds
Simplifies duplicated implementation across multiple recipes that all
inherited from java.bbclass.
Previously implementation was not flexible in supporting other make
job-limiting flags (like -l for load) that are typically passed in
through PARALLEL_MAKE. (OpenJDK doesn't know about these other flags
that might have gotten tagged on after the value for -j.)
Signed-off-by: Kyle Russell <bkylerussell@gmail.com>
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Diffstat (limited to 'recipes-core/openjdk/openjdk-8-cross.inc')
-rw-r--r-- | recipes-core/openjdk/openjdk-8-cross.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-core/openjdk/openjdk-8-cross.inc b/recipes-core/openjdk/openjdk-8-cross.inc index 11e94ce..47fe35d 100644 --- a/recipes-core/openjdk/openjdk-8-cross.inc +++ b/recipes-core/openjdk/openjdk-8-cross.inc | |||
@@ -40,7 +40,7 @@ SRC_URI_append = "\ | |||
40 | " | 40 | " |
41 | 41 | ||
42 | EXTRA_OECONF_append = "\ | 42 | EXTRA_OECONF_append = "\ |
43 | --with-jobs=${@get_jdk8_native_jobs(d)} \ | 43 | --with-jobs=${@java_get_parallel_make(d)} \ |
44 | \ | 44 | \ |
45 | --with-sys-root=${STAGING_DIR} \ | 45 | --with-sys-root=${STAGING_DIR} \ |
46 | --with-tools-dir=${STAGING_DIR_NATIVE} \ | 46 | --with-tools-dir=${STAGING_DIR_NATIVE} \ |
@@ -65,13 +65,13 @@ do_install_append() { | |||
65 | if ${@bb.utils.contains('PACKAGECONFIG', 'repack', 'true', 'false', d)} ; then | 65 | if ${@bb.utils.contains('PACKAGECONFIG', 'repack', 'true', 'false', d)} ; then |
66 | if [ -d ${D}${JDK_HOME} ] ; then | 66 | if [ -d ${D}${JDK_HOME} ] ; then |
67 | find ${D}${JDK_HOME} -name "*.jar" -print0 | \ | 67 | find ${D}${JDK_HOME} -name "*.jar" -print0 | \ |
68 | xargs -0 -n1 -P ${@get_jdk8_native_jobs(d)} sh -c ' \ | 68 | xargs -0 -n1 -P ${@java_get_parallel_make(d)} sh -c ' \ |
69 | echo "Repacking" "$0" ; \ | 69 | echo "Repacking" "$0" ; \ |
70 | pack200 --repack --effort=9 --segment-limit=-1 --modification-time=latest --strip-debug "$0"' | 70 | pack200 --repack --effort=9 --segment-limit=-1 --modification-time=latest --strip-debug "$0"' |
71 | fi | 71 | fi |
72 | if [ -d ${D}${JRE_HOME} ] ; then | 72 | if [ -d ${D}${JRE_HOME} ] ; then |
73 | find ${D}${JRE_HOME} -name "*.jar" -print0 | \ | 73 | find ${D}${JRE_HOME} -name "*.jar" -print0 | \ |
74 | xargs -0 -n1 -P ${@get_jdk8_native_jobs(d)} sh -c ' \ | 74 | xargs -0 -n1 -P ${@java_get_parallel_make(d)} sh -c ' \ |
75 | echo "Repacking" "$0" ; \ | 75 | echo "Repacking" "$0" ; \ |
76 | pack200 --repack --effort=9 --segment-limit=-1 --modification-time=latest --strip-debug "$0"' | 76 | pack200 --repack --effort=9 --segment-limit=-1 --modification-time=latest --strip-debug "$0"' |
77 | fi | 77 | fi |