wok-current rev 6927

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.
author Christopher Rogers <slaxemulator@gmail.com>
date Fri Oct 22 17:37:00 2010 +0000 (2010-10-22)
parents 914973b8364b
children 8346e7a4c25f
files icedtea6-jdk/receipt
line diff
     1.1 --- a/icedtea6-jdk/receipt	Fri Oct 22 17:13:31 2010 +0000
     1.2 +++ b/icedtea6-jdk/receipt	Fri Oct 22 17:37:00 2010 +0000
     1.3 @@ -43,9 +43,6 @@
     1.4  	local ECJ_VERSION
     1.5  	ECJ_VERSION="3.6"
     1.6  
     1.7 -	export ALT_PARALLEL_COMPILE_JOBS="4"
     1.8 -	export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
     1.9 -
    1.10  	cd $src
    1.11  	mkdir drops
    1.12  	sed -i -e 's/mkdir -p drops/true/' -e 's/ jar xf/ fastjar xf/'  Makefile*
    1.13 @@ -91,7 +88,6 @@
    1.14  	autoreconf &&
    1.15  	./configure \
    1.16  		--prefix=/usr \
    1.17 -		--with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
    1.18  		--disable-plugin \
    1.19  		--disable-docs \
    1.20  		--with-ecj \
    1.21 @@ -104,14 +100,15 @@
    1.22  		--with-rhino=/usr/share/java/js.jar \
    1.23  		--with-abs-install-dir=$JVM_PREFIX \
    1.24  		$CONFIGURE_ARGS &&
    1.25 -	make ARCH_PREFIX=  || exit 1
    1.26 +	make -j 1 ARCH_PREFIX=  || exit 1
    1.27  
    1.28 +	# NOTE: don't build with -j 4. Only build with -j 1 or tank will crash
    1.29  	# NOTE: IcedTea6 does not define an "install" target
    1.30  	
    1.31  	rm -r -f $src/_pkg
    1.32  
    1.33  	local JVM_BUILDDIR
    1.34 -	JVM_BUILDDIR=$src/openjdk/build/linux-i586/j2sdk-image
    1.35 +	JVM_BUILDDIR=$src/openjdk.build/j2sdk-image
    1.36  	local JVM_DESTDIR
    1.37  	JVM_DESTDIR=$src/_pkg$JVM_PREFIX
    1.38