SliTaz Repositories

     1.1 --- a/icedtea6-jdk/receipt	Thu May 26 18:26:21 2011 +0000
     1.2 +++ b/icedtea6-jdk/receipt	Fri May 27 00:54:12 2011 +0200
     1.3 @@ -6,27 +6,25 @@
     1.4  CATEGORY="development"
     1.5  SHORT_DESC="A Free Software harness for OpenJDK."
     1.6  MAINTAINER="rcx@zoominternet.net"
     1.7 -DEPENDS="icedtea6-jre glibc-base zlib xorg-libX11 xorg-libXau xorg-libXdmcp"
     1.8 -BUILD_DEPENDS="gcc+gcj autoconf automake m4 diffutils gawk \
     1.9 -coreutils-file-special coreutils-file-summarize alsa-lib-dev cups-dev \
    1.10 -file patch findutils perl zip unzip bzip2 tar cpio glib-dev \
    1.11 -fastjar rhino ecj apache-ant xalan-xerces-j wget \
    1.12 -freetype-dev gtk+-dev giflib-dev jpeg-dev libpng-dev \
    1.13 -xorg-inputproto xorg-kbproto xorg-libXi-dev xorg-libXinerama-dev \
    1.14 -xorg-libXp-dev xorg-libXt-dev xorg-libXtst-dev xorg-printproto \
    1.15 -xorg-recordproto xorg-renderproto xorg-xextproto xorg-xineramaproto xorg-xproto \
    1.16 -nss jdk6-jaxws jdk6-jaxp jdk6-jaf openjdk-6-src"
    1.17  TARBALL="$SOURCE-$VERSION.tar.gz"
    1.18  WEB_SITE="http://www.iced-tea.org/"
    1.19  WGET_URL="http://icedtea.classpath.org/download/source/$TARBALL"
    1.20  
    1.21 +DEPENDS="icedtea6-jre xorg xorg-libXtst xorg-libXp cups"
    1.22 +BUILD_DEPENDS="gcc+gcj autoconf automake m4 diffutils gawk cups-dev wget cpio \
    1.23 +coreutils-file-special coreutils-file-summarize alsa-lib-dev file patch perl \
    1.24 +zip unzip findutils  bzip2 tar glib-dev fastjar rhino ecj apache-ant jpeg-dev \
    1.25 +xalan-xerces-j gtk+-dev giflib-dev libpng-dev xorg-dev xorg-libXtst-dev \
    1.26 +xorg-libXp-dev xorg-dev-proto nss nss-dev jdk6-jaxws jdk6-jaxp jdk6-jaf \
    1.27 +openjdk-6-src"
    1.28 +
    1.29  # Note to icedtea6 updaters,
    1.30  # You should check version into receipts:
    1.31  # * jdk6-jaxws (version: $openjdk_version)
    1.32  # * jdk6-jaxp (version: $openjdk_version)
    1.33  # * jdk6-jaf (version: $openjdk_version)
    1.34  # * openjdk-6-src (version: $openjdk_version-$openjdk_date)
    1.35 -# Theses receipts allow to have source tarballs managed by tazwok.
    1.36 +# Theses receipts allow to have source tarballs in SRC.
    1.37  openjdk_version="b20"
    1.38  openjdk_date="21_jun_2010"
    1.39  
    1.40 @@ -46,25 +44,14 @@
    1.41  	cd $src
    1.42  	mkdir drops
    1.43  	sed -i -e 's/mkdir -p drops/true/' -e 's/ jar xf/ fastjar xf/'  Makefile*
    1.44 -
    1.45 -	report open-bloc
    1.46  	
    1.47  	# Check than all sources files are available, or exit.
    1.48  	for i in jdk6-jaxws jdk6-jaxp jdk6-jaf; do
    1.49 -		tazwok get-src $i || { report close-bloc; return 1; }
    1.50  		cp $SOURCES_REPOSITORY/$i-$openjdk_version.zip drops
    1.51  	done
    1.52 -	tazwok get-src openjdk-6-src || { report close-bloc; return 1; }
    1.53 +	#tazwok get-src openjdk-6-src || { report close-bloc; return 1; }
    1.54  	cp $SOURCES_REPOSITORY/openjdk-6-src-$openjdk_version-$openjdk_date.tar.gz .
    1.55  
    1.56 -	report step "Checking that all needed tools are OK"
    1.57 -	[ -L /usr/bin/find ] && tazpkg get-install findutils --forced
    1.58 -	[ -L /usr/bin/diff ] && tazpkg get-install diffutils --forced
    1.59 -	[ "$(readlink /usr/bin/awk)" == "gawk" ] ||
    1.60 -	tazpkg get-install gawk --forced
    1.61 -	[ -L /usr/bin/sed ] && tazpkg get-install sed --forced
    1.62 -
    1.63 -	report step "Running compilation"
    1.64  	mem=$(free | awk '/Mem:/ { printf "%d\n",$2/1024 }')
    1.65  	cat > slitaz.sh <<EOT
    1.66  # Busybox compatibility
    1.67 @@ -89,18 +76,18 @@
    1.68  		--with-rhino=/usr/share/java/js.jar \
    1.69  		--with-abs-install-dir=$JVM_PREFIX \
    1.70  		$CONFIGURE_ARGS &&
    1.71 -	make -j 1 ARCH_PREFIX=  || { report close-bloc; return 1; }
    1.72 +	make -j 1 ARCH_PREFIX=
    1.73  
    1.74  	# NOTE: don't build with -j 4. Only build with -j 1 or tank will crash
    1.75  	# NOTE: IcedTea6 does not define an "install" target
    1.76  	
    1.77 -	report step "Copying needed files to install dir"
    1.78 +	echo "Copying needed files to install dir"
    1.79  	rm -rf $DESTDIR
    1.80  
    1.81  	local JVM_BUILDDIR
    1.82  	JVM_BUILDDIR=$src/openjdk.build/j2sdk-image
    1.83  	local JVM_DESTDIR
    1.84 -	JVM_DESTDIR=$DESTDIR$JVM_PREFIX
    1.85 +	JVM_DESTDIR=${DESTDIR}$JVM_PREFIX
    1.86  
    1.87  	mkdir -p $JVM_DESTDIR
    1.88  	cp -a $JVM_BUILDDIR/bin $JVM_DESTDIR
    1.89 @@ -127,7 +114,6 @@
    1.90  		ln -s $JVM_PREFIX/jre/bin/$jbin $JVM_DESTDIR/bin/$jbin
    1.91  		ln -s $JVM_PREFIX/jre/bin/$jbin $DESTDIR/usr/jre-bin
    1.92  	done
    1.93 -	report close-bloc
    1.94  }
    1.95  
    1.96  # Rules to gen a SliTaz package suitable for Tazpkg.