/hg/icedtea6: 2 new changesets

[andrew at icedtea.classpath.org]

changeset 18fbca177289 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=18fbca177289
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Feb 22 14:04:21 2011 +0000

	PR635: Disable ARM port on hs20 to allow Zero to build.

	2011-02-22 Andrew John Hughes <ahughes at redhat.com>

	 PR635: zero fails to build on icedtea6 trunk 20110217 with
	hs20
		* Makefile.am: (ports): Disable ARM port on hs20.
		* NEWS: Updated.


changeset 39b3029b88d9 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=39b3029b88d9
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Feb 22 14:05:19 2011 +0000

	Merge


diffstat:

3 files changed, 17 insertions(+), 1 deletion(-)
ChangeLog   |   12 ++++++++++++
Makefile.am |    5 ++++-
NEWS        |    1 +

diffs (57 lines):

diff -r 3ebdb1a50ba8 -r 39b3029b88d9 ChangeLog
--- a/ChangeLog	Tue Feb 22 12:52:39 2011 +0000
+++ b/ChangeLog	Tue Feb 22 14:05:19 2011 +0000
@@ -1,3 +1,15 @@ 2011-02-22  Andrew John Hughes  <ahughes
+2011-02-22  Andrew John Hughes  <ahughes at redhat.com>
+
+	PR635: zero fails to build on icedtea6 trunk 20110217 with hs20
+	* Makefile.am:
+	(ports): Disable ARM port on hs20.
+	* NEWS: Updated.
+
+2011-02-22  Xerxes Ranby  <xranby at zafena.se>
+
+	Fix icedtea-ecj build with --enable-jamvm 
+	(stamps/icedtea-ecj.stamp): Add stamps/jamvm.stamp
+
 2011-02-22  Andrew John Hughes  <ahughes at redhat.com>
 
 	PR497: Mercurial revision detection not very reliable
diff -r 3ebdb1a50ba8 -r 39b3029b88d9 Makefile.am
--- a/Makefile.am	Tue Feb 22 12:52:39 2011 +0000
+++ b/Makefile.am	Tue Feb 22 14:05:19 2011 +0000
@@ -958,11 +958,13 @@ clean-replace-hotspot:
 
 # Copy ports sources into tree
 stamps/ports.stamp: stamps/replace-hotspot.stamp
+if !WITH_ALT_HSBUILD
 	for target in $(abs_top_srcdir)/arm_port/hotspot/tools \
 		      $(abs_top_srcdir)/arm_port/hotspot/src/*cpu/* ; do \
 	  link=$$(dirname $$target | sed 's/^.*arm_port/openjdk/'); \
 	  cp -rv $$target $$link; \
 	done
+endif
 	mkdir -p stamps
 	touch stamps/ports.stamp
 
@@ -1533,7 +1535,8 @@ clean-add-tzdata-support-debug:
 # ===================
 
 stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
- $(OPENJDK_ECJ_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp
+ $(OPENJDK_ECJ_TREE) stamps/jamvm.stamp stamps/cacao.stamp \
+ stamps/rewrite-rhino.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV_ECJ) \
 	  -C openjdk-ecj/ \
diff -r 3ebdb1a50ba8 -r 39b3029b88d9 NEWS
--- a/NEWS	Tue Feb 22 12:52:39 2011 +0000
+++ b/NEWS	Tue Feb 22 14:05:19 2011 +0000
@@ -432,6 +432,7 @@ New in release 1.10 (2011-XX-XX):
   - PR632: patches/security/20110215/6878713.patch breaks shark zero build
   - PR103: Usage of native2ascii during bootstrap
   - PR633: IcedTea installs javaws manpages on x86 even with --disable-webstart
+  - PR635: zero fails to build on icedtea6 trunk 20110217 with hs20
 * Cleanup
   - Patches are no longer prefixed with 'icedtea-'.
   - All m4 macros are now prefixed with 'IT_' to denote their origin correctly.