/hg/icedtea7: CACAO support for OpenJDK7

[xranby at icedtea.classpath.org]

changeset ff55f6591be9 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=ff55f6591be9
author: Xerxes Ranby <xerxes at zafena.se>
date: Fri Feb 10 13:28:45 2012 +0100

	CACAO support for OpenJDK7

	2012-02-10 Xerxes Ranby <xerxes at zafena.se>

	 * Makefile.am (CACAO_VERSION): Updated CACAO to
	2012-02-09 revision. (CACAO_SHA256SUM): Updated.
	(stamps/cacao.stamp): Use --with-java-runtime-library=openjdk7.
	Add -f when creating client and server symlinks to handle repeat
	builds. Link the fake libjsig.so to CACAO libjvm.so, and
	touch fake Xusage.txt to work with latest OpenJDK
	ALT_HOTSPOT_IMPORT_PATH functionality.
		* patches/cacao/version.patch: Removed, replaced by upstream CACAO
	changeset 30edcde287d9.


diffstat:

 ChangeLog                   |  11 +++++++++++
 Makefile.am                 |  11 ++++++-----
 patches/cacao/version.patch |  20 --------------------
 3 files changed, 17 insertions(+), 25 deletions(-)

diffs (82 lines):

diff -r ea914bacafad -r ff55f6591be9 ChangeLog
--- a/ChangeLog	Thu Feb 09 00:17:25 2012 +0000
+++ b/ChangeLog	Fri Feb 10 13:28:45 2012 +0100
@@ -1,3 +1,14 @@
+2012-02-10  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	* Makefile.am
+	(CACAO_VERSION): Updated CACAO to 2012-02-09 revision.
+	(CACAO_SHA256SUM): Updated.
+	(stamps/cacao.stamp): Use --with-java-runtime-library=openjdk7.
+	Add -f when creating client and server symlinks to handle repeat builds.
+	Link the fake libjsig.so to CACAO libjvm.so, and touch fake Xusage.txt
+	to work with latest OpenJDK ALT_HOTSPOT_IMPORT_PATH functionality.
+	* patches/cacao/version.patch: Removed, replaced by upstream CACAO changeset 30edcde287d9.
+
 2012-10-08  Andrew John Hughes  <ahughes at redhat.com>
 
 	(HOTSPOT_CHANGESET): Bump to fix HotSpot merge
diff -r ea914bacafad -r ff55f6591be9 Makefile.am
--- a/Makefile.am	Thu Feb 09 00:17:25 2012 +0000
+++ b/Makefile.am	Fri Feb 10 13:28:45 2012 +0100
@@ -20,8 +20,8 @@
 LANGTOOLS_SHA256SUM = fc893721f587ac47a24aeec4a41774efd9df7f43db9c76efc1a380b061b23ade
 OPENJDK_SHA256SUM = 714a000514e273bae755f4cc90df839a298583b38bb93518d6cf805dede99b6d
 
-CACAO_VERSION = 4549072ab2de
-CACAO_SHA256SUM = ec097ce96f047abbaeab4faab752c121d29f08bdeae358038a0b7cde03361d07
+CACAO_VERSION = a567bcb7f589
+CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
 CACAO_BASE_URL = http://icedtea.classpath.org/download/drops/cacao
 CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz
 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
@@ -247,7 +247,6 @@
 if BUILD_CACAO
 ICEDTEA_PATCHES += \
 	patches/cacao/launcher.patch \
-	patches/cacao/version.patch \
 	patches/cacao/jsig.patch \
 	patches/cacao/memory.patch
 endif
@@ -1991,12 +1990,14 @@
 	  --build=$(build_alias) \
 	  --target=$(target_alias) \
 	  --prefix=$(abs_top_builddir)/cacao/install \
-	  --with-java-runtime-library=openjdk \
+	  --with-java-runtime-library=openjdk7 \
 	  --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
 	  --with-java-runtime-library-classes=$(RUNTIME) \
 	  --enable-jre-layout $(CACAO_CONFIGURE_ARGS); \
 	$(ARCH_PREFIX) $(MAKE) -j$(PARALLEL_JOBS) install
-	ln -s server $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/client
+	ln -sf server $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/client
+	touch $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt
+	ln -sf client/libjvm.so $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so
 endif
 endif
 	mkdir -p stamps
diff -r ea914bacafad -r ff55f6591be9 patches/cacao/version.patch
--- a/patches/cacao/version.patch	Thu Feb 09 00:17:25 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-diff -Nru cacao.orig2/cacao/src/vm/global.h cacao2/cacao/src/vm/global.h
---- cacao.orig/cacao/src/vm/global.h	2009-08-05 01:12:02.000000000 +0100
-+++ cacao/cacao/src/vm/global.h	2009-08-05 01:51:01.000000000 +0100
-@@ -132,14 +132,14 @@
- 
- /* some Java related defines **************************************************/
- 
--#define JAVA_VERSION    "1.5.0"         /* this version is supported by CACAO */
--#define CLASS_VERSION   "50.0"
-+#define JAVA_VERSION    "1.7.0"         /* this version is supported by CACAO */
-+#define CLASS_VERSION   "51.0"
- 
- 
- /* Java class file constants **************************************************/
- 
- #define MAGIC             0xCAFEBABE
--#define MAJOR_VERSION     50
-+#define MAJOR_VERSION     51
- #define MINOR_VERSION     0
- 
-