changeset in /hg/icedtea: Use jar `cat file-list` not gjar -@ st...

[Mark Wielaard]

changeset cebc828cf765 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=cebc828cf765
description:
	Use jar `cat file-list` not gjar -@ stdin extension.

	2008-05-30  Mark Wielaard  <mark at klomp.org>

	       * patches/icedtea-ecj.patch: Use `cat file-list` not gjar -@ stdin.

diffstat:

2 files changed, 10 insertions(+), 6 deletions(-)
ChangeLog                 |    4 ++++
patches/icedtea-ecj.patch |   12 ++++++------

diffs (40 lines):

diff -r ca6053992b46 -r cebc828cf765 ChangeLog
--- a/ChangeLog	Fri May 30 15:37:38 2008 +0200
+++ b/ChangeLog	Fri May 30 15:39:55 2008 +0200
@@ -1,3 +1,7 @@ 2008-05-30  Mark Wielaard  <mark at klomp.o
+2008-05-30  Mark Wielaard  <mark at klomp.org>
+
+	* patches/icedtea-ecj.patch: Use `cat file-list` not gjar -@ stdin.
+
 2008-05-30  Mark Wielaard  <mark at klomp.org>
 
 	* Makefile.am (check-jdk): Use BUILD_OUTPUT_DIR not LINUX_DIR.
diff -r ca6053992b46 -r cebc828cf765 patches/icedtea-ecj.patch
--- a/patches/icedtea-ecj.patch	Fri May 30 15:37:38 2008 +0200
+++ b/patches/icedtea-ecj.patch	Fri May 30 15:39:55 2008 +0200
@@ -665,9 +665,9 @@ diff -ru openjdk-ecj.orig/langtools/make
  	$(prep-target)
 -	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
 -	    @$(RES_JAR_ARGLIST) $(JAR_JFLAGS)
-+	(cd $(CLASSBINDIR) && $(CAT) $(RES_JAR_FILELIST) | \
-+	$(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \
-+	    $(JAR_JFLAGS))
++	(cd $(CLASSBINDIR) && \
++	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
++	    $(JAR_JFLAGS) `cat $(RES_JAR_FILELIST)`)
  	@$(java-vm-cleanup)
  
  # Create jsse.jar containing SunJSSE implementation classes
@@ -680,9 +680,9 @@ diff -ru openjdk-ecj.orig/langtools/make
  	$(prep-target)
 -	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
 -	    @$(RT_JAR_ARGLIST) $(JAR_JFLAGS)
-+	(cd $(CLASSBINDIR) && $(CAT) $(RT_JAR_FILELIST) | \
-+	$(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \
-+	    $(JAR_JFLAGS))
++	(cd $(CLASSBINDIR) && \
++	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
++	    $(JAR_JFLAGS) `$(CAT) $(RT_JAR_FILELIST)`)
  	@$(java-vm-cleanup)
  
  # Meta-index construction to make core class loaders lazier