Mercurial > hg > release > icedtea7-2.0
changeset 2344:6ec76d7f5601
Bump cacao version to changeset including build fixes for ARM and S390
2010-09-07 Matthias Klose <doko@ubuntu.com>
* Makefile.am: Bump cacao version to changeset including build
fixes for ARM and S390.
* patches/cacao/launcher.patch: Regenerate.
| author | doko@ubuntu.com |
|---|---|
| date | Tue, 07 Sep 2010 12:57:46 +0200 |
| parents | a58071a38743 |
| children | 90d1974ff380 |
| files | ChangeLog Makefile.am patches/cacao/launcher.patch |
| diffstat | 3 files changed, 17 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Sep 06 23:52:04 2010 +0100 +++ b/ChangeLog Tue Sep 07 12:57:46 2010 +0200 @@ -1,3 +1,9 @@ +2010-09-07 Matthias Klose <doko@ubuntu.com> + + * Makefile.am: Bump cacao version to changeset including build + fixes for ARM and S390. + * patches/cacao/launcher.patch: Regenerate. + 2010-09-06 Andrew John Hughes <ahughes@redhat.com> Bump to b106.
--- a/Makefile.am Mon Sep 06 23:52:04 2010 +0100 +++ b/Makefile.am Tue Sep 07 12:57:46 2010 +0200 @@ -18,8 +18,8 @@ LANGTOOLS_SHA256SUM = 81b48f5f5782e62b0555735be24e294d3274c48fa1e027a63eb005465a505385 OPENJDK_SHA256SUM = edb332586e2442bdbd4eed19c059535ade56dba5b436257031a0e5e827b89f12 -CACAO_VERSION = 66e762d869dd -CACAO_SHA256SUM = 9a558ffb69479f2d31995bdeb90cd2abc616050e76a6be7263c72e2e302ca4e6 +CACAO_VERSION = e321b101a9ee +CACAO_SHA256SUM = 46bc5b6212c199dc4a3dbebe6386fe15a8248625a5dffa17115aab394a298444 CACAO_BASE_URL = http://mips.complang.tuwien.ac.at/hg/cacao/archive CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.bz2 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2
--- a/patches/cacao/launcher.patch Mon Sep 06 23:52:04 2010 +0100 +++ b/patches/cacao/launcher.patch Tue Sep 07 12:57:46 2010 +0200 @@ -1,7 +1,6 @@ -diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile ---- openjdk.orig/jdk/make/docs/Makefile 2009-05-19 01:11:05.000000000 +0100 -+++ openjdk/jdk/make/docs/Makefile 2009-05-20 20:17:49.000000000 +0100 -@@ -36,7 +36,7 @@ +--- openjdk/jdk/make/docs/Makefile.orig 2010-08-27 20:01:53.000000000 +0200 ++++ openjdk/jdk/make/docs/Makefile 2010-09-07 12:56:00.309691118 +0200 +@@ -70,7 +70,7 @@ ifeq ($(ARCH_DATA_MODEL),64) MAX_VM_MEMORY = 1024 else @@ -9,10 +8,10 @@ + MAX_VM_MEMORY = 768 endif - # ---- openjdk/jdk/src/share/bin/java.c.orig 2009-05-26 21:16:09.000000000 +0000 -+++ openjdk/jdk/src/share/bin/java.c 2009-05-26 21:29:41.000000000 +0000 -@@ -175,6 +175,8 @@ + # List of all possible directories for javadoc to look for sources +--- openjdk/jdk/src/share/bin/java.c.orig 2010-09-07 05:24:49.307192201 +0200 ++++ openjdk/jdk/src/share/bin/java.c 2010-09-07 12:56:00.309691118 +0200 +@@ -174,6 +174,8 @@ InvocationFunctions ifn; } JavaMainArgs; @@ -21,7 +20,7 @@ /* * Entry point. */ -@@ -1875,6 +1877,8 @@ +@@ -1923,6 +1925,8 @@ { /* Create a new thread to create JVM and invoke main method */ JavaMainArgs args; @@ -30,7 +29,7 @@ int rslt; args.argc = argc; -@@ -1883,7 +1887,17 @@ +@@ -1931,7 +1935,17 @@ args.classname = classname; args.ifn = *ifn;