Mercurial > hg > icedtea6-hg

changeset 2929:849f72a5a514

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR1120: Upgrade CACAO to 2012-11-04 version Changes: - Unified version for icedtea6/7 - CA166, CA167: check-langtools fixes for icedtea6 - Implemented sun.misc.Perf.highResCounter - CACAO now identifies by its own Mercurial revision - Some memory barrier maintenance - Ability to run when compiled as Thumb on armv5 (no Thumb JIT though) 2012-11-04 Stefan Ring <stefan@complang.tuwien.ac.at> * Makefile.am (CACAO_VERSION, CACAO_SHA256SUM): Updated. (ICEDTEA_PATCHES): Removed patches/cacao/jsig.patch. (stamps/cacao.stamp): Create Xusage.txt and libjsig.so as for JamVM. * patches/cacao/jsig.patch: Removed.
author Stefan Ring <stefan@complang.tuwien.ac.at>
date Mon, 05 Nov 2012 16:53:59 +0100
parents 8f6318c8c2f4
children 1793e2fb84c5
files Makefile.am patches/cacao/jsig.patch
diffstat 2 files changed, 4 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.am	Thu Nov 01 14:03:48 2012 -0400
+++ b/Makefile.am	Mon Nov 05 16:53:59 2012 +0100
@@ -5,8 +5,8 @@
 OPENJDK_VERSION = b27
 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
 
-CACAO_VERSION = cff92704c4e0
-CACAO_SHA256SUM = dc768c9d097fb056ad34fc6d5a57e8fd4f3b24bf515be92acc5ee4208160eb3f
+CACAO_VERSION = 9968abd511a3
+CACAO_SHA256SUM = 3b1ce9d2205d2afba4614a194484341758ee2cb340396310ac2c00e5a2a20955
 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
@@ -433,7 +433,6 @@
 if BUILD_CACAO
 ICEDTEA_PATCHES += \
 	patches/cacao/launcher.patch \
-	patches/cacao/jsig.patch \
 	patches/cacao/memory.patch
 endif
 
@@ -2136,6 +2135,8 @@
 	  --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
+	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
--- a/patches/cacao/jsig.patch	Thu Nov 01 14:03:48 2012 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-diff -Nru cacao.orig/Makefile.am cacao/Makefile.am
---- cacao.orig/cacao/src/cacao/Makefile.am	2008-08-04 17:51:28.000000000 +0100
-+++ cacao/cacao/src/cacao/Makefile.am	2010-05-11 10:29:35.000000000 +0100
-@@ -96,12 +96,12 @@
- 	$(mkdir_p) $(prefix)/jre/lib/$(JAVA_ARCH)/server
- 	$(LN_S) -f $(libdir)/libjvm.so $(prefix)/jre/lib/$(JAVA_ARCH)/server
- 	$(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/server/Xusage.txt
--	$(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjsig.so
-+	$(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/libjsig.so
- 
- uninstall-local:
- 	rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjvm.so
- 	rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/Xusage.txt
--	rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjsig.so
-+	rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/libjsig.so
- endif
- 
-