[patch] update cacao changeset to fix build failures on armel and s390

[Dr Andrew John Hughes]

On 08:49 Tue 24 Aug     , Matthias Klose wrote:
> fixing cacao build failures on armel and s390, this should go to the 6-1.9 
> branch, icedtea6 and icedtea7.
> 

Approved.  I think version-parsing.patch was already dropped from 7, and
I just never got round to it with 6 :-(

> 
> 	* Makefile.am: Bump cacao version to changeset including build
> 	fixes for ARM and S390.
> 	* patches/cacao/version-parsing.patch: Remove, applied upstream.
> 
> diff -r 933fec08a004 Makefile.am
> --- a/Makefile.am	Mon Aug 23 17:49:28 2010 -0400
> +++ b/Makefile.am	Tue Aug 24 08:43:36 2010 +0200
> @@ -5,8 +5,8 @@
>  OPENJDK_VERSION = b20
>  OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
>  
> -CACAO_VERSION = dd4532afd08a
> -CACAO_SHA256SUM = fc876403aeb46c6c16693cfc75ba0a2e581f7a98ddd02ac7f2bf4fc5c20765b4
> +CACAO_VERSION = e321b101a9ee
> +CACAO_SHA256SUM = 46bc5b6212c199dc4a3dbebe6386fe15a8248625a5dffa17115aab394a298444
>  CACAO_BASE_URL = http://mips.complang.tuwien.ac.at
>  CACAO_URL = $(CACAO_BASE_URL)/hg/cacao/archive/$(CACAO_VERSION).tar.bz2
>  CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2
> @@ -306,8 +306,7 @@
>  	patches/cacao/launcher.patch \
>  	patches/cacao/arm-arch-defines.patch \
>  	patches/cacao/jsig.patch \
> -	patches/cacao/memory.patch \
> -	patches/cacao/version-parsing.patch
> +	patches/cacao/memory.patch
>  endif
>  
>  if WITH_CACAO


-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8