/hg/icedtea: 6 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Tue Apr 1 01:59:54 UTC 2014 

changeset 80e121d36c8b in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=80e121d36c8b
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Sep 30 04:25:29 2011 +0100

	Use IcedTea server for CACAO downloads, as with 6.

	2010-11-19  Andrew John Hughes  <ahughes at redhat.com>

		* Makefile.am:
		(CACAO_BASE_URL): Switch to using IcedTea
		server for CACAO drops too.
		(CACAO_URL): Likewise.


changeset 0d3e101af018 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=0d3e101af018
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Apr 01 01:36:29 2014 +0100

	CACAO: Updated to 2011-08-08 revision.

	2011-08-09  Xerxes R?nby  <xerxes at zafena.se>

		CACAO
		- CA159: Exception handler blocks / register mixup.
		- Set thread to RUNNABLE during Thread.start.
		- Removed state-setting function call that would be done by the thread
		  itself, creating a nasty race.
		* Makefile.am
		(CACAO_VERSION): Updated CACAO to 2011-08-08 revision.
		(CACAO_SHA256SUM): Updated.


changeset 138d6c171019 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=138d6c171019
author: Xerxes Ranby <xerxes at zafena.se>
date: Tue Aug 30 12:30:04 2011 +0200

	CACAO: CA149: Used wrong class loader, Updated to 2011-08-29 revision.

	2011-08-30  Xerxes Ranby  <xerxes at zafena.se>

		CACAO
		- CA149: Used wrong class loader.
		- src/vm/javaobjects.cpp (java_lang_reflect_Method::invoke):
		  [OPENJDK] stack index of caller was off by one, causing many apt
		  (Annotation Processing Tool) failures.
		* NEWS: Updated.
		* Makefile.am
		(CACAO_VERSION): Updated CACAO to 2011-08-29 revision.
		(CACAO_SHA256SUM): Updated.


changeset 95ec73579840 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=95ec73579840
author: Xerxes Ranby <xerxes at zafena.se>
date: Tue Apr 01 01:50:23 2014 +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.


changeset c0e1199f441b in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c0e1199f441b
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Apr 01 01:51:51 2014 +0100

	Update CACAO to latest tip.

	2013-04-24  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		* patches/cacao/jsig.patch:
		Removed.
		* Makefile.am:
		(CACAO_VERSION): Bump to current tip.
		(CACAO_SHA256SUM): Likewise.
		(ICEDTEA_PATCHES): Drop unneeded jsig patch.


changeset 4acb21372190 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=4acb21372190
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Apr 01 01:58:21 2014 +0100

	Actually delete file removed in 1128225eff23


diffstat:

 ChangeLog                            |  49 ++++++++++++++++++++++++++++++++++++
 Makefile.am                          |  16 +++++-----
 patches/cacao/arm-arch-defines.patch |  18 -------------
 patches/cacao/jsig.patch             |  18 -------------
 patches/cacao/version.patch          |  21 ---------------
 5 files changed, 57 insertions(+), 65 deletions(-)

diffs (171 lines):

diff -r 102993442e37 -r 4acb21372190 ChangeLog
--- a/ChangeLog	Mon Mar 24 17:19:19 2014 -0400
+++ b/ChangeLog	Tue Apr 01 01:58:21 2014 +0100
@@ -1,3 +1,52 @@
+2013-04-24  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	* patches/cacao/jsig.patch:
+	Removed.
+	* Makefile.am:
+	(CACAO_VERSION): Bump to current tip.
+	(CACAO_SHA256SUM): Likewise.
+	(ICEDTEA_PATCHES): Drop unneeded jsig patch.
+
+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.
+
+2011-08-30  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	CACAO
+	- CA149: Used wrong class loader.
+	- src/vm/javaobjects.cpp (java_lang_reflect_Method::invoke):
+	  [OPENJDK] stack index of caller was off by one, causing many apt
+	  (Annotation Processing Tool) failures.
+	* Makefile.am
+	(CACAO_VERSION): Updated CACAO to 2011-08-29 revision.
+	(CACAO_SHA256SUM): Updated.
+
+2011-08-09  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	CACAO
+	- CA159: Exception handler blocks / register mixup.
+	- Set thread to RUNNABLE during Thread.start.
+	- Removed state-setting function call that would be done by the thread
+	  itself, creating a nasty race.
+	* Makefile.am
+	(CACAO_VERSION): Updated CACAO to 2011-08-08 revision.
+	(CACAO_SHA256SUM): Updated.
+
+2010-11-19  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(CACAO_BASE_URL): Switch to using IcedTea
+	server for CACAO drops too.
+	(CACAO_URL): Likewise.
+
 2014-03-24  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* contrib/jck/compile-native-code.sh:
diff -r 102993442e37 -r 4acb21372190 Makefile.am
--- a/Makefile.am	Mon Mar 24 17:19:19 2014 -0400
+++ b/Makefile.am	Tue Apr 01 01:58:21 2014 +0100
@@ -20,10 +20,10 @@
 HS_CHANGESET = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
 HS_URL = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
 
-CACAO_VERSION = d6264eb66506
-CACAO_SHA256SUM = 94ea7899e806ccbc33a732b5113a8f969d8b1f4ce7ffd27cf04577054f65f63c
-CACAO_BASE_URL = http://mips.complang.tuwien.ac.at/hg/cacao/archive
-CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.bz2
+CACAO_VERSION = e215e36be9fc
+CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab
+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.bz2
 
 JAMVM_VERSION = ec18fb9e49e62dce16c5094ef1527eed619463aa
@@ -229,8 +229,6 @@
 if BUILD_CACAO
 ICEDTEA_PATCHES += \
 	patches/cacao/launcher.patch \
-	patches/cacao/version.patch \
-	patches/cacao/jsig.patch \
 	patches/cacao/6714758.patch \
 	patches/cacao/memory.patch
 endif
@@ -1785,14 +1783,16 @@
 	  --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
 	mkdir -p $(abs_top_builddir)/cacao/install/lib
 	touch $(abs_top_builddir)/cacao/install/hotspot/lib/sa-jdi.jar
-	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 102993442e37 -r 4acb21372190 patches/cacao/arm-arch-defines.patch
--- a/patches/cacao/arm-arch-defines.patch	Mon Mar 24 17:19:19 2014 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-diff -Nru cacao.orig/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h cacao/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h
---- cacao.orig/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h	2010-05-19 12:14:46.000000000 +0100
-+++ cacao/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h	2010-06-21 18:35:53.000000000 +0100
-@@ -33,7 +33,13 @@
- 
- /* NEC LE-IT: gcc has no way to easily check the arm architecture
-  * but defines only one of __ARM_ARCH_x__ to be true			*/
--#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_7__)  
-+#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \
-+	|| defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) \
-+	|| defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) \
-+	|| defined(__ARM_ARCH_6M__) \
-+	|| defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \
-+	|| defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__)
-+
- AO_INLINE void
- AO_nop_full()
- {
diff -r 102993442e37 -r 4acb21372190 patches/cacao/jsig.patch
--- a/patches/cacao/jsig.patch	Mon Mar 24 17:19:19 2014 -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
- 
- 
diff -r 102993442e37 -r 4acb21372190 patches/cacao/version.patch
--- a/patches/cacao/version.patch	Mon Mar 24 17:19:19 2014 -0400
+++ /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
- 
-

More information about the distro-pkg-dev mailing list