wok-4.x rev 10654

icedtea6-jdk: smal change for dumb
author Christophe Lincoln <pankso@slitaz.org>
date Fri May 27 05:41:18 2011 +0200 (2011-05-27)
parents 3dc5b5917da0
children 4ae2b0a61e64
files icedtea6-jdk/receipt
line diff
     1.1 --- a/icedtea6-jdk/receipt	Fri May 27 04:46:06 2011 +0200
     1.2 +++ b/icedtea6-jdk/receipt	Fri May 27 05:41:18 2011 +0200
     1.3 @@ -75,10 +75,7 @@
     1.4  		--with-xerces2-jar=/usr/share/java/xercesImpl.jar \
     1.5  		--with-rhino=/usr/share/java/js.jar \
     1.6  		--with-abs-install-dir=$JVM_PREFIX \
     1.7 -		$CONFIGURE_ARGS &&
     1.8 -	
     1.9 -	# NOTE: don't build with -j 4. Only build with -j 1 or tank will crash
    1.10 -	# NOTE: IcedTea6 does not define an "install" target
    1.11 +		$CONFIGURE_ARGS || exit 1
    1.12  	make -j 1 ARCH_PREFIX= 2>&1 | sed s/ERROR/error/
    1.13  	
    1.14  	echo "Copying needed files to install dir..."
    1.15 @@ -88,15 +85,15 @@
    1.16  	JVM_BUILDDIR=$src/openjdk.build/j2sdk-image
    1.17  	local JVM_DESTDIR
    1.18  	JVM_DESTDIR=${DESTDIR}$JVM_PREFIX
    1.19 -	echo "JVM_BUILDDIR: $JVM_BUILDDIR"
    1.20 -	echo "JVM_DESTDIR: $JVM_DESTDIR"
    1.21 +	echo "OpenJDK build     : source/openjdk.build/j2sdk-image"
    1.22 +	echo "OpenJDK install   : install/$JVM_PREFIX"
    1.23  
    1.24 -	echo "Copying files: bin/ lib/"
    1.25 +	echo "Copying JDK files : bin/ lib/"
    1.26  	mkdir -p $JVM_DESTDIR
    1.27  	cp -a $JVM_BUILDDIR/bin $JVM_DESTDIR
    1.28  	cp -a $JVM_BUILDDIR/lib $JVM_DESTDIR
    1.29  
    1.30 -	echo "Copying JRE files: bin/ lib/"
    1.31 +	echo "Copying JRE files : bin/ lib/"
    1.32  	mkdir -p $JVM_DESTDIR/jre
    1.33  	cp -a $JVM_BUILDDIR/jre/bin $JVM_DESTDIR/jre
    1.34  	cp -a $JVM_BUILDDIR/jre/lib $JVM_DESTDIR/jre