From bac4a2703747dbe7644bb9c9bee331dc1ecc6ac1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 12 May 2013 02:01:47 -0700 Subject: icedtea: Make shared state friendly icedtea-native encodes absolute build time classpaths which wont work in sstate however at same time we can override it with env variables like BOOTCLASSPATH and LD_LIBRARY_PATH to reflect current build environment. Secondly, exclude ICEDTEA_PARALLEL_MAKE from shared state signatures, it can alter signatures if PARALLEL_MAKE value between producer and consumer of sstate is not matching. Now that icedtea7-native is shared state safe, remove the shared state invalidation on jamvm-native that was needed for icedtea7-native to build Signed-off-by: Khem Raj --- recipes-core/icedtea/icedtea7-native.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'recipes-core/icedtea') 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" # openjdk looks in /usr/include and /usr/lib for freetype by default. export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2" export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}" +export LD_LIBRARY_PATH = "$LD_LIBRARY_PATH:${STAGING_LIBDIR}/classpath:${STAGING_LIBDIR}/jamvm" +export BOOTCLASSPATH = "${STAGING_DATADIR}/jamvm/classes.zip:${STAGING_DATADIR}/classpath/glibj.zip" # OpenJDK supports parallel compilation but uses a plain number for this. # In OE we have PARALLEL_MAKE which is the actual option passed to make, @@ -55,10 +57,8 @@ def get_jdk7_native_jobs(d): # Whatever found in PARALLEL_MAKE was not suitable. return "1" -JDK_JOBS = "${@get_jdk7_native_jobs(d)}" - EXTRA_OECONF = "\ - --with-parallel-jobs=${JDK_JOBS} \ + --with-parallel-jobs=${@get_jdk7_native_jobs(d)} \ \ --disable-tests \ --disable-hotspot-tests \ @@ -88,8 +88,6 @@ JDK_DIR = "icedtea7-native" JDK_INSTALL_DIR = "${D}/${libdir_jvm}/${JDK_DIR}" do_configure_prepend() { - echo "Configure with parallel-jobs: ${JDK_JOBS}" - case "${TRANSLATED_TARGET_ARCH}" in x86-64) libarch=amd64 @@ -248,3 +246,5 @@ do_install() { # Fix missing write permissions on the files. chmod ug+w -R ${JDK_INSTALL_DIR} } + +get_jdk7_native_jobs[vardepsexclude] += "ICEDTEA_PARALLEL_MAKE" -- cgit v1.2.3-54-g00ecf