Cacao support for OpenJDK7 - icedtea7 patch

[Xerxes Rånby]

2012-02-09 15:54, David Flamme skrev:
> Hello Xerxes,
> 
> I missed some changes for the M4 macros to look in the right pathes, but this changeset should fix it: http://www.complang.tuwien.ac.at/hg/cacao/rev/a567bcb7f589
> 
> cheers david

Thank you David
This new version work, I have been able to build and run CACAO in combination with OpenJDK7 u2 by using the new icedtea7 patch below:
Ok for icedtea7 HEAD?

xranby at xranby-ESPRIMO-P7935:~/test/cm30$ ../../icedtea7-cacao-build/openjdk.build/j2sdk-image/bin/java -showversion CaffeineMarkEmbeddedApp
java version "1.7.0_02-icedtea"
IcedTea Runtime Environment (2.1pre+rea914bacafad+) (Ubuntu build 1.7.0_02-icedtea-b147)
CACAO (build 1.1.0pre2, compiled mode)

Sieve score = 59609 (98)
Loop score = 66877 (2017)
Logic score = 81621 (0)
String score = 19094 (708)
Float score = 31052 (185)
Method score = 55668 (166650)
Overall score = 46971

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.

diff -r ea914bacafad Makefile.am
--- a/Makefile.am	Thu Feb 09 00:17:25 2012 +0000
+++ b/Makefile.am	Fri Feb 10 10:17:52 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