# HG changeset patch # User Hans-G?nter Theisgen # Date 1665724244 -3600 # Node ID 58d8bc17643a28d55abec8f88456d91f5462b501 # Parent 92a3819b6bc82f42948cc0546c3866ecd2722f32 icedtea6-jdk: adjusted ecj version diff -r 92a3819b6bc8 -r 58d8bc17643a icedtea6-jdk/receipt --- a/icedtea6-jdk/receipt Thu Oct 13 17:53:47 2022 +0100 +++ b/icedtea6-jdk/receipt Fri Oct 14 06:10:44 2022 +0100 @@ -47,8 +47,10 @@ JVM_PREFIX="/usr/lib/jvm/java-icedtea" # NOTE: This build does not seem to work with ECJ 3.5 + # actual ecj version is 4.14 local ECJ_VERSION - ECJ_VERSION="3.6" +# ECJ_VERSION="3.6" + ECJ_VERSION="4.14" makefiles=$(find $src -name '*akefile*') echo $makefiles | xargs sed -i 's|uname -m|echo i486|' @@ -60,12 +62,14 @@ # Check then if all sources files are available, or exit. REPO=http://icedtea.wildebeest.org/download/drops - if [ -x /usr/bin/cook ]; then - for i in jdk6-jaxws jdk6-jaxp jdk6-jaf; do + if [ -x /usr/bin/cook ] + then + for i in jdk6-jaxws jdk6-jaxp jdk6-jaf + do [ -s $SOURCES_REPOSITORY/$i-$openjdk_version.zip ] || wget -P $SOURCES_REPOSITORY $REPO/$i-$openjdk_version.zip cp $SOURCES_REPOSITORY/$i-$openjdk_version.zip drops || return 1 - done + done # openjdk-6-src is in BUILD_DEPENDS and must be build like jdk6-* pkgs. [ -s $SOURCES_REPOSITORY/openjdk-6-src-$openjdk_version-$openjdk_date.tar.gz ] || wget -P $SOURCES_REPOSITORY $REPO/openjdk-6-src-$openjdk_version-$openjdk_date.tar.gz @@ -92,7 +96,8 @@ sed -i -e 's|touch .*|&\n\tsh slitaz.sh|' \ -e 's/--check/-c/' \ -e 's/Bsymbolic/& -lgcj/' \ - -e 's/ln -sfv/ln -sf/' Makefile* + -e 's/ln -sfv/ln -sf/' \ + Makefile* aclocal autoconf && automake --add-missing &&