# HG changeset patch # User Antoine Bodin # Date 1331313566 -3600 # Node ID 0adddcc6b22770410a1fe5c6b3c3ca6c79d49d28 # Parent 0a352dc005b7508b6edb2f26ee623f469abc40a7 icedtea6-jdk: fix compiles_rules to work with tazwok. I know it's a bit messy but I need this. diff -r 0a352dc005b7 -r 0adddcc6b227 icedtea6-jdk/receipt --- a/icedtea6-jdk/receipt Fri Mar 09 14:58:49 2012 +0100 +++ b/icedtea6-jdk/receipt Fri Mar 09 18:19:26 2012 +0100 @@ -46,11 +46,21 @@ sed -i -e 's/mkdir -p drops/true/' -e 's/ jar xf/ fastjar xf/' Makefile* # Check than all sources files are available, or exit. - for i in jdk6-jaxws jdk6-jaxp jdk6-jaf; do - cp $SOURCES_REPOSITORY/$i-$openjdk_version.zip drops || exit 1 - done - # openjdk-6-src is in BUILD_DEPENDS and must be build like jdk6-* pkgs. - cp $SOURCES_REPOSITORY/openjdk-6-src-$openjdk_version-$openjdk_date.tar.gz . + if [ -x /usr/bin/cook ]; then + for i in jdk6-jaxws jdk6-jaxp jdk6-jaf; do + cp $SOURCES_REPOSITORY/$i-$openjdk_version.zip drops || return 1 + done + # openjdk-6-src is in BUILD_DEPENDS and must be build like jdk6-* pkgs. + cp $SOURCES_REPOSITORY/openjdk-6-src-$openjdk_version-$openjdk_date.tar.gz . + else + report open-bloc + for i in jdk6-jaxws jdk6-jaxp jdk6-jaf openjdk-6-src; do + tazwok get-src $i + cp $SOURCES_REPOSITORY/$i-$openjdk_version.zip drops + done + cp $SOURCES_REPOSITORY/openjdk-6-src-$openjdk_version-$openjdk_date.tar.gz . + report step "Running compilation" + fi mem=$(free | awk '/Mem:/ { printf "%d\n",$2/1024 }') cat > slitaz.sh <&1 | sed s/ERROR/error/ echo "Copying needed files to install dir..." @@ -118,6 +128,9 @@ ln -s $JVM_PREFIX/jre/bin/$jbin $JVM_DESTDIR/bin/$jbin ln -s $JVM_PREFIX/jre/bin/$jbin $DESTDIR/usr/jre-bin done + if [ ! -x /usr/bin/cook ]; then + report close-bloc + fi } # Rules to gen a SliTaz package suitable for Tazpkg.