/hg/icedtea: 2 new changesets

[andrew at icedtea.classpath.org]

changeset 10f206eaddc7 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=10f206eaddc7
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Dec 24 02:08:42 2009 +0000

	Make updating rt.jar dependent on LACKS_SUN_AWT_TOOLKIT.

	2009-12-23 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (rt.stamp): Also make zip updating
	dependent on LACKS_SUN_AWT_TOOLKIT.


changeset a58d87327776 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a58d87327776
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Dec 24 02:12:53 2009 +0000

	Merge


diffstat:

2 files changed, 14 insertions(+), 1 deletion(-)
ChangeLog   |   11 +++++++++++
Makefile.am |    4 +++-

diffs (42 lines):

diff -r 03d84febc75e -r a58d87327776 ChangeLog
--- a/ChangeLog	Mon Dec 21 13:40:28 2009 +0000
+++ b/ChangeLog	Thu Dec 24 02:12:53 2009 +0000
@@ -1,3 +1,14 @@ 2009-12-21  Andrew John Hughes  <ahughes
+2009-12-23  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(rt.stamp): Also make zip updating dependent
+	on LACKS_SUN_AWT_TOOLKIT.
+
+2009-12-21  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Fix path for
+	--with-jdk-home= option.
+
 2009-12-21  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r 03d84febc75e -r a58d87327776 Makefile.am
--- a/Makefile.am	Mon Dec 21 13:40:28 2009 +0000
+++ b/Makefile.am	Thu Dec 24 02:12:53 2009 +0000
@@ -2344,7 +2344,7 @@ clean-add-cacao-debug:
 # configure script arguments, quoted in single quotes
 CONFIGURE_ARGS = @CONFIGURE_ARGS@
 ADD_ZERO_CONFIGURE_ARGS = \
-	--with-jdk-home=$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/j2sdk-image \
+	--with-jdk-home=$(BUILD_OUTPUT_DIR)/j2sdk-image \
 	--disable-bootstrap --enable-zero
 if ADD_SHARK_BUILD
 ADD_ZERO_CONFIGURE_ARGS += \
@@ -2560,9 +2560,11 @@ endif
 	touch $@
 
 stamps/rt.stamp: stamps/rt-class-files.stamp
+if LACKS_SUN_AWT_TOOLKIT
 	(cd lib/rt ; \
 	 $(ZIP) -qur $(abs_top_builddir)/bootstrap/boot/jre/lib/rt.jar \
 	 com java javax sun );
+endif
 	mkdir -p stamps
 	touch $@