changeset 310:a62d79e2140c

2007-10-31 Joshua Sumali <jsumali@redhat.com> * patches/icedtea-sunsrc.patch: Fixed patch to include some missing sources.
author Joshua Sumali <jsumali@redhat.com>
date Wed, 31 Oct 2007 16:43:46 -0400
parents 482cb136e12b
children fb428e9dbfa6
files ChangeLog patches/icedtea-sunsrc.patch
diffstat 2 files changed, 11 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Oct 30 13:18:22 2007 -0400
+++ b/ChangeLog	Wed Oct 31 16:43:46 2007 -0400
@@ -1,3 +1,8 @@
+2007-10-31  Joshua Sumali  <jsumali@redhat.com>
+
+	* patches/icedtea-sunsrc.patch: Fixed patch to include some missing
+	sources.
+
 2007-10-30  Lillian Angel  <langel@redhat.com>
 
 	* patches/icedtea-bytecodeInterpreterWithChecks.patch: New patch to
--- a/patches/icedtea-sunsrc.patch	Tue Oct 30 13:18:22 2007 -0400
+++ b/patches/icedtea-sunsrc.patch	Wed Oct 31 16:43:46 2007 -0400
@@ -1,5 +1,5 @@
---- 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
+--- openjdk.orig/j2se/make/common/Release.gmk	2007-10-26 16:46:41.000000000 -0400
++++ openjdk/j2se/make/common/Release.gmk	2007-10-28 18:28:19.000000000 -0400
 @@ -625,6 +625,10 @@
  	    $(BOOT_JAVA_CMD) -jar $(JARREORDER_JARFILE) \
  		-o  $@.temp $(ABS_LIBDIR)/classlist $(NOT_RT_JAR_LIST) . )
@@ -11,13 +11,12 @@
  	@($(CD) $(CLASSBINDIR) && $(java-vm-cleanup))
  
  # Create the rt.jar file list & non-class files list
-@@ -1002,6 +1006,9 @@
+@@ -1001,6 +1005,8 @@
+ 	    ($(CD) $$d && $(TAR) cf - -T $(ABS_TEMPDIR)/src-files.list ) \
  	       | ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \
  	  fi; \
++	  (($(CD) $$d && $(TAR) cf - -T $(ABS_TEMPDIR)/sun_sources_list ) \
++	    | ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -)) > /dev/null 2>&1 ; \
  	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; \