Mercurial > hg > release > icedtea7-2.2

changeset 2263:bee59676264f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR icedtea/495: Extend JAR_KNOWS_ATFILE patch 2010-06-15 Stefan Ring <stefan@complang.tuwien.ac.at> PR icedtea/495 * patches/boot/jar.patch: Apply workaround in more places.
author Stefan Ring <stefan@complang.tuwien.ac.at>
date Mon, 14 Jun 2010 22:19:24 +0200
parents 731f4c50030c
children 09f5a7f1fb25
files ChangeLog patches/boot/jar.patch
diffstat 2 files changed, 49 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Jun 14 17:17:14 2010 +0100
+++ b/ChangeLog	Mon Jun 14 22:19:24 2010 +0200
@@ -1,3 +1,8 @@
+2010-06-15  Stefan Ring  <stefan@complang.tuwien.ac.at>
+
+	PR icedtea/495
+	* patches/boot/jar.patch: Apply workaround in more places.
+
 2010-06-14  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
--- a/patches/boot/jar.patch	Mon Jun 14 17:17:14 2010 +0100
+++ b/patches/boot/jar.patch	Mon Jun 14 22:19:24 2010 +0200
@@ -24,3 +24,47 @@
  
  # Create jsse.jar containing SunJSSE implementation classes
  JSSE_JAR=$(ABS_TEMPDIR)/jsse-orig.jar
+@@ -711,9 +722,19 @@
+ RT_JAR=$(ABS_TEMPDIR)/rt-orig.jar
+ $(RT_JAR): $(RT_JAR_FILELIST) $(JAR_MANIFEST_FILE)
+ 	$(prep-target)
++ifneq (,$(JAR_KNOWS_ATFILE))
+ 	$(CD) $(CLASSBINDIR) && \
+ 	    $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
+ 	        @$(RT_JAR_FILELIST) $(BOOT_JAR_JFLAGS)
++else ifneq (,$(JAR_ACCEPTS_STDIN_LIST))
++	$(CD) $(CLASSBINDIR) && $(CAT) $(RT_JAR_FILELIST) | \
++	    $(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \
++	        $(BOOT_JAR_JFLAGS)
++else
++	$(CD) $(CLASSBINDIR) && \
++	    $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
++	        $(BOOT_JAR_JFLAGS) `cat $(RT_JAR_FILELIST)`
++endif
+ 	@$(CD) $(CLASSBINDIR) && $(java-vm-cleanup)
+ 
+ # Meta-index construction to make core class loaders lazier
+--- openjdk-boot/jdk/make/modules/Makefile.orig	2010-06-13 10:37:13.000000000 +0200
++++ openjdk-boot/jdk/make/modules/Makefile	2010-06-13 10:42:37.000000000 +0200
+@@ -111,10 +111,21 @@
+            fi ; \
+            $(MKDIR) -p $(ABS_MODULES_DIR)/$$m/lib; \
+ 	   $(CD) $(MODULE_CLASSES) && \
++ifneq (,$(JAR_KNOWS_ATFILE))
+                $(BOOT_JAR_CMD) c0mf $(MODULE_JAR_MANIFEST_FILE) \
+ 		   $(ABS_MODULES_DIR)/$$m/lib/$$m.jar \
+ 	           @$(TMP)/tmp.cf \
+                    $(BOOT_JAR_JFLAGS); \
++else ifneq (,$(JAR_ACCEPTS_STDIN_LIST))
++               $(CAT) $(TMP)/tmp.cf | \
++               $(BOOT_JAR_CMD) c0mf@ $(MODULE_JAR_MANIFEST_FILE) \
++		   $(ABS_MODULES_DIR)/$$m/lib/$$m.jar \
++                   $(BOOT_JAR_JFLAGS); \
++else
++               $(BOOT_JAR_CMD) c0mf $(MODULE_JAR_MANIFEST_FILE) \
++		   $(ABS_MODULES_DIR)/$$m/lib/$$m.jar \
++                   $(BOOT_JAR_JFLAGS) `cat $(TMP)/tmp.cf`; \
++endif
+ 	   for s in `$(GREP) "^$$m" $(MODULES_LIST)` ; do \
+                if [ -d $(TMP)/$$s ] ; then \
+                	   $(CP) -rf $(TMP)/$$s/*  $(ABS_MODULES_DIR)/$$m; \