changeset in /hg/icedtea: 2007-10-19 Joshua Sumali <jsumali at re...

[Joshua Sumali]

changeset cee826c52531 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=cee826c52531
description:
	2007-10-19  Joshua Sumali  <jsumali at redhat.com>

	        * patches/icedtea-sunsrc.patch: New file.
	        * Makefile.am: Added icedtea-sunsrc to patch list.
	        * Makefile.in: Regenerated.

diffstat:

3 files changed, 30 insertions(+)
ChangeLog                    |    6 ++++++
Makefile.am                  |    1 +
patches/icedtea-sunsrc.patch |   23 +++++++++++++++++++++++

diffs (54 lines):

diff -r 10ce9710bee5 -r cee826c52531 ChangeLog
--- a/ChangeLog	Thu Oct 18 16:04:37 2007 -0400
+++ b/ChangeLog	Fri Oct 19 12:33:26 2007 -0400
@@ -3,6 +3,12 @@ 2007-10-23  Christan Thalinger  <twisti@
 	* j2se/make/common/Defs-linux.gmk: Updated for b22.
 	* j2se/make/common/shared/Platform.gmk: Likewise.
 	* j2se/src/share/bin/java.c: Likewise.
+
+2007-10-19  Joshua Sumali  <jsumali at redhat.com>
+
+	* patches/icedtea-sunsrc.patch: New file.
+	* Makefile.am: Added icedtea-sunsrc to patch list.
+	* Makefile.in: Regenerated.
 
 2007-10-18  Lillian Angel  <langel at redhat.com>
 
diff -r 10ce9710bee5 -r cee826c52531 Makefile.am
--- a/Makefile.am	Thu Oct 18 16:04:37 2007 -0400
+++ b/Makefile.am	Fri Oct 19 12:33:26 2007 -0400
@@ -151,6 +151,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-gtkplaf.patch \
 	patches/icedtea-memory-limits.patch \
 	patches/icedtea-xjc.patch \
+	patches/icedtea-sunsrc.patch \
 	$(FAST_BUILD_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
diff -r 10ce9710bee5 -r cee826c52531 patches/icedtea-sunsrc.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-sunsrc.patch	Fri Oct 19 12:33:26 2007 -0400
@@ -0,0 +1,23 @@
+--- openjdk.orig/j2se/make/common/Release.gmk	2007-10-17 16:06:30.000000000 -0400
++++ openjdk/j2se/make/common/Release.gmk	2007-10-18 14:47:55.000000000 -0400
+@@ -625,6 +625,10 @@
+ 	    $(BOOT_JAVA_CMD) -jar $(JARREORDER_JARFILE) \
+ 		-o  $@.temp $(ABS_LIBDIR)/classlist $(NOT_RT_JAR_LIST) . )
+ 	$(MV) $@.temp $@
++	$(CAT) $@ | $(GREP) "^sun" | $(GREP) "class" | $(GREP) -v '\$$' \
++	    > $(ABS_TEMPDIR)/sun_classes_list
++	sed 's/\.class/\.java/' < $(ABS_TEMPDIR)/sun_classes_list \
++	    > $(ABS_TEMPDIR)/sun_sources_list
+ 	@($(CD) $(CLASSBINDIR) && $(java-vm-cleanup))
+ 
+ # Create the rt.jar file list & non-class files list
+@@ -1002,6 +1006,9 @@
+ 	       | ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \
+ 	  fi; \
+ 	done
++	($(CD) $(SHARE_SRC)/classes && $(TAR) cf - -T \
++	    $(ABS_TEMPDIR)/sun_sources_list ) \
++	    | ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -);
+   else
+ 	for d in $(SOURCE_DIRS); do \
+ 	  $(RM) $(ABS_TEMPDIR)/src-files.list; \