Mercurial > hg > release > icedtea7-2.2
changeset 2496:c141efcd6191
Get CACAO at least as far as the failing ./configure.
2011-10-19 Andrew John Hughes <ahughes@redhat.com>
* patches/cacao/6714758.patch:
Removed; upstream.
* Makefile.am:
(ICEDTEA_PATCHES): Drop above patch.
(extract-cacao): Use gzip not bzip2.
(extract-jamvm): Explicitly use gzip.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 19 Oct 2011 06:30:36 +0100 |
| parents | fbad82bc6985 |
| children | c448ba9ca41b |
| files | ChangeLog Makefile.am patches/cacao/6714758.patch |
| diffstat | 3 files changed, 11 insertions(+), 43 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Sep 30 16:32:13 2011 +0100 +++ b/ChangeLog Wed Oct 19 06:30:36 2011 +0100 @@ -1,3 +1,12 @@ +2011-10-19 Andrew John Hughes <ahughes@redhat.com> + + * patches/cacao/6714758.patch: + Removed; upstream. + * Makefile.am: + (ICEDTEA_PATCHES): Drop above patch. + (extract-cacao): Use gzip not bzip2. + (extract-jamvm): Explicitly use gzip. + 2011-09-30 Andrew John Hughes <ahughes@redhat.com> * acinclude.m4:
--- a/Makefile.am Fri Sep 30 16:32:13 2011 +0100 +++ b/Makefile.am Wed Oct 19 06:30:36 2011 +0100 @@ -247,7 +247,6 @@ patches/cacao/launcher.patch \ patches/cacao/version.patch \ patches/cacao/jsig.patch \ - patches/cacao/6714758.patch \ patches/cacao/memory.patch endif @@ -1194,7 +1193,7 @@ if ! test -d cacao/cacao ; \ then \ mkdir cacao ; \ - $(TAR) xjf $(CACAO_SRC_ZIP) -C cacao ; \ + $(TAR) xzf $(CACAO_SRC_ZIP) -C cacao ; \ dir=$$(basename cacao/cacao-*) ; \ ln -s $$dir cacao/cacao ; \ cd cacao/cacao ; \ @@ -1214,7 +1213,7 @@ if ! test -d jamvm ; \ then \ mkdir jamvm ; \ - $(TAR) xf $(JAMVM_SRC_ZIP) -C jamvm ; \ + $(TAR) xzf $(JAMVM_SRC_ZIP) -C jamvm ; \ dir=$$(basename jamvm/jamvm-*) ; \ ln -s $$dir jamvm/jamvm ; \ fi
--- a/patches/cacao/6714758.patch Fri Sep 30 16:32:13 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -diff -Nru cacao.orig/cacaog/contrib/mapfile-vers-product cacao/cacao-8948a434c10d/contrib/mapfile-vers-product ---- cacao.orig/cacao/contrib/mapfile-vers-product 2010-05-19 12:14:46.000000000 +0100 -+++ cacao/cacao/contrib/mapfile-vers-product 2010-06-21 20:08:28.000000000 +0100 -@@ -86,6 +86,7 @@ - JVM_EnableCompiler; - JVM_Exit; - JVM_FillInStackTrace; -+ JVM_FindClassFromBootLoader; - JVM_FindClassFromClass; - JVM_FindClassFromClassLoader; - JVM_FindLibraryEntry; -diff -Nru cacao.orig/cacaog/src/native/vm/openjdk/jvm.cpp cacao/cacao-8948a434c10d/src/native/vm/openjdk/jvm.cpp ---- cacao.orig/cacao/src/native/vm/openjdk/jvm.cpp 2010-05-19 12:14:46.000000000 +0100 -+++ cacao/cacao/src/native/vm/openjdk/jvm.cpp 2010-06-21 20:08:28.000000000 +0100 -@@ -668,6 +668,9 @@ - - assert(throwError == false); - -+ if (name == NULL) -+ return NULL; -+ - u = utf_new_char(name); - cl = loader_hashtable_classloader_add((java_handle_t *) loader); - -@@ -685,6 +688,15 @@ - } - - -+/* JVM_FindClassFromBootLoader */ -+ -+jclass JVM_FindClassFromBootLoader(JNIEnv* env, const char* name) -+{ -+ TRACEJVMCALLS(("JVM_FindClassFromBootLoader(name=%s)", name)); -+ return JVM_FindClassFromClassLoader(env, name, JNI_FALSE, -+ (jobject)NULL, false); -+} -+ - /* JVM_FindClassFromClass */ - - jclass JVM_FindClassFromClass(JNIEnv *env, const char *name, jboolean init, jclass from)