Mercurial > hg > release > icedtea6-1.4.1

changeset 318:cee826c52531 cacao

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2007-10-19 Joshua Sumali <jsumali@redhat.com> * patches/icedtea-sunsrc.patch: New file. * Makefile.am: Added icedtea-sunsrc to patch list. * Makefile.in: Regenerated.
author Joshua Sumali <jsumali@redhat.com>
date Fri, 19 Oct 2007 12:33:26 -0400
parents 10ce9710bee5
children 7304808731d0
files ChangeLog Makefile.am patches/icedtea-sunsrc.patch
diffstat 3 files changed, 30 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Oct 18 16:04:37 2007 -0400
+++ b/ChangeLog	Fri Oct 19 12:33:26 2007 -0400
@@ -4,6 +4,12 @@
 	* j2se/make/common/shared/Platform.gmk: Likewise.
 	* j2se/src/share/bin/java.c: Likewise.
 
+2007-10-19  Joshua Sumali  <jsumali@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@redhat.com>
 
 	* javac.in, javap.in: Removed
--- 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 @@
 	patches/icedtea-gtkplaf.patch \
 	patches/icedtea-memory-limits.patch \
 	patches/icedtea-xjc.patch \
+	patches/icedtea-sunsrc.patch \
 	$(FAST_BUILD_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
--- /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; \