wok rev 25478

icedtea6-jdk: adjusted ecj version
author Hans-G?nter Theisgen
date Fri Oct 14 06:10:44 2022 +0100 (2022-10-14)
parents 92a3819b6bc8
children 4349b733ca4a
files icedtea6-jdk/receipt
line diff
     1.1 --- a/icedtea6-jdk/receipt	Thu Oct 13 17:53:47 2022 +0100
     1.2 +++ b/icedtea6-jdk/receipt	Fri Oct 14 06:10:44 2022 +0100
     1.3 @@ -47,8 +47,10 @@
     1.4  	JVM_PREFIX="/usr/lib/jvm/java-icedtea"
     1.5  	
     1.6  	# NOTE: This build does not seem to work with ECJ 3.5
     1.7 +	# actual ecj version is 4.14
     1.8  	local ECJ_VERSION
     1.9 -	ECJ_VERSION="3.6"
    1.10 +#	ECJ_VERSION="3.6"
    1.11 +	ECJ_VERSION="4.14"
    1.12  
    1.13  	makefiles=$(find $src -name '*akefile*')
    1.14  	echo $makefiles | xargs sed -i 's|uname -m|echo i486|' 
    1.15 @@ -60,12 +62,14 @@
    1.16  
    1.17  	# Check then if all sources files are available, or exit.
    1.18  	REPO=http://icedtea.wildebeest.org/download/drops
    1.19 -	if [ -x /usr/bin/cook ]; then
    1.20 -		for i in jdk6-jaxws jdk6-jaxp jdk6-jaf; do
    1.21 +	if [ -x /usr/bin/cook ]
    1.22 +	  then
    1.23 +		for i in jdk6-jaxws jdk6-jaxp jdk6-jaf
    1.24 +		  do
    1.25  			[ -s $SOURCES_REPOSITORY/$i-$openjdk_version.zip ] ||
    1.26  			     wget -P $SOURCES_REPOSITORY $REPO/$i-$openjdk_version.zip
    1.27  			cp $SOURCES_REPOSITORY/$i-$openjdk_version.zip drops || return 1
    1.28 -		done
    1.29 +		  done
    1.30  		# openjdk-6-src is in BUILD_DEPENDS and must be build like jdk6-* pkgs.
    1.31  		[ -s $SOURCES_REPOSITORY/openjdk-6-src-$openjdk_version-$openjdk_date.tar.gz ] ||
    1.32  		    wget -P $SOURCES_REPOSITORY $REPO/openjdk-6-src-$openjdk_version-$openjdk_date.tar.gz
    1.33 @@ -92,7 +96,8 @@
    1.34  	sed -i  -e 's|touch .*|&\n\tsh slitaz.sh|' \
    1.35  		-e 's/--check/-c/' \
    1.36  		-e 's/Bsymbolic/& -lgcj/' \
    1.37 -		-e 's/ln -sfv/ln -sf/' Makefile*
    1.38 +		-e 's/ln -sfv/ln -sf/' \
    1.39 +		Makefile*
    1.40  	aclocal
    1.41  	autoconf &&
    1.42  	automake --add-missing &&