diff options
Diffstat (limited to 'recipes-core/icedtea/icedtea7-native.inc')
-rw-r--r-- | recipes-core/icedtea/icedtea7-native.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc index b9e2056..aa105b7 100644 --- a/recipes-core/icedtea/icedtea7-native.inc +++ b/recipes-core/icedtea/icedtea7-native.inc | |||
@@ -35,6 +35,8 @@ B = "${S}/build" | |||
35 | # openjdk looks in /usr/include and /usr/lib for freetype by default. | 35 | # openjdk looks in /usr/include and /usr/lib for freetype by default. |
36 | export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2" | 36 | export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2" |
37 | export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}" | 37 | export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}" |
38 | export LD_LIBRARY_PATH = "$LD_LIBRARY_PATH:${STAGING_LIBDIR}/classpath:${STAGING_LIBDIR}/jamvm" | ||
39 | export BOOTCLASSPATH = "${STAGING_DATADIR}/jamvm/classes.zip:${STAGING_DATADIR}/classpath/glibj.zip" | ||
38 | 40 | ||
39 | # OpenJDK supports parallel compilation but uses a plain number for this. | 41 | # OpenJDK supports parallel compilation but uses a plain number for this. |
40 | # In OE we have PARALLEL_MAKE which is the actual option passed to make, | 42 | # In OE we have PARALLEL_MAKE which is the actual option passed to make, |
@@ -55,10 +57,8 @@ def get_jdk7_native_jobs(d): | |||
55 | # Whatever found in PARALLEL_MAKE was not suitable. | 57 | # Whatever found in PARALLEL_MAKE was not suitable. |
56 | return "1" | 58 | return "1" |
57 | 59 | ||
58 | JDK_JOBS = "${@get_jdk7_native_jobs(d)}" | ||
59 | |||
60 | EXTRA_OECONF = "\ | 60 | EXTRA_OECONF = "\ |
61 | --with-parallel-jobs=${JDK_JOBS} \ | 61 | --with-parallel-jobs=${@get_jdk7_native_jobs(d)} \ |
62 | \ | 62 | \ |
63 | --disable-tests \ | 63 | --disable-tests \ |
64 | --disable-hotspot-tests \ | 64 | --disable-hotspot-tests \ |
@@ -88,8 +88,6 @@ JDK_DIR = "icedtea7-native" | |||
88 | JDK_INSTALL_DIR = "${D}/${libdir_jvm}/${JDK_DIR}" | 88 | JDK_INSTALL_DIR = "${D}/${libdir_jvm}/${JDK_DIR}" |
89 | 89 | ||
90 | do_configure_prepend() { | 90 | do_configure_prepend() { |
91 | echo "Configure with parallel-jobs: ${JDK_JOBS}" | ||
92 | |||
93 | case "${TRANSLATED_TARGET_ARCH}" in | 91 | case "${TRANSLATED_TARGET_ARCH}" in |
94 | x86-64) | 92 | x86-64) |
95 | libarch=amd64 | 93 | libarch=amd64 |
@@ -248,3 +246,5 @@ do_install() { | |||
248 | # Fix missing write permissions on the files. | 246 | # Fix missing write permissions on the files. |
249 | chmod ug+w -R ${JDK_INSTALL_DIR} | 247 | chmod ug+w -R ${JDK_INSTALL_DIR} |
250 | } | 248 | } |
249 | |||
250 | get_jdk7_native_jobs[vardepsexclude] += "ICEDTEA_PARALLEL_MAKE" | ||