# HG changeset patch # User Christopher Rogers # Date 1287769020 0 # Node ID bdaad11139915a4d00d0f59c2a3aa86955396d6b # Parent 914973b8364bdc0bd28ec1b064adfb6f1dea790e Fixed icedtea6-jdk (i hope). Added -j 1 back into it. Also changed JVM_BUILDDIR to src/openjdk.build/j2sdk-image so i will get packaged. Added comment to not change to -j 4 or tank will crash. diff -r 914973b8364b -r bdaad1113991 icedtea6-jdk/receipt --- a/icedtea6-jdk/receipt Fri Oct 22 17:13:31 2010 +0000 +++ b/icedtea6-jdk/receipt Fri Oct 22 17:37:00 2010 +0000 @@ -43,9 +43,6 @@ local ECJ_VERSION ECJ_VERSION="3.6" - export ALT_PARALLEL_COMPILE_JOBS="4" - export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}" - cd $src mkdir drops sed -i -e 's/mkdir -p drops/true/' -e 's/ jar xf/ fastjar xf/' Makefile* @@ -91,7 +88,6 @@ autoreconf && ./configure \ --prefix=/usr \ - --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \ --disable-plugin \ --disable-docs \ --with-ecj \ @@ -104,14 +100,15 @@ --with-rhino=/usr/share/java/js.jar \ --with-abs-install-dir=$JVM_PREFIX \ $CONFIGURE_ARGS && - make ARCH_PREFIX= || exit 1 + make -j 1 ARCH_PREFIX= || exit 1 + # NOTE: don't build with -j 4. Only build with -j 1 or tank will crash # NOTE: IcedTea6 does not define an "install" target rm -r -f $src/_pkg local JVM_BUILDDIR - JVM_BUILDDIR=$src/openjdk/build/linux-i586/j2sdk-image + JVM_BUILDDIR=$src/openjdk.build/j2sdk-image local JVM_DESTDIR JVM_DESTDIR=$src/_pkg$JVM_PREFIX