Mercurial > hg > release > icedtea6-1.3

changeset 1051:f9d81fd1466d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merging with latest from main repo
author Deepak Bhole <dbhole@redhat.com>
date Wed, 24 Sep 2008 11:44:16 -0400
parents 30567fe7d579 (current diff) d2579e023b0e (diff)
children 098f7819fe90
files ChangeLog Makefile.am
diffstat 5 files changed, 38 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/AUTHORS	Wed Sep 24 11:35:01 2008 -0400
+++ b/AUTHORS	Wed Sep 24 11:44:16 2008 -0400
@@ -11,6 +11,7 @@
 Andrew John Hughes <gnu_andrew@member.fsf.org>
 Matthias Klose <doko@ubuntu.com>
 Francis Kung <fkung@redhat.com>
+DJ Lucas <dj@linuxfromscratch.org>
 Casey Marshall <csm@gnu.org>
 Dan Munckton <lists@munckfish.net>
 Raif Naffah <admin@naffah-raif.name>
--- a/ChangeLog	Wed Sep 24 11:35:01 2008 -0400
+++ b/ChangeLog	Wed Sep 24 11:44:16 2008 -0400
@@ -50,6 +50,15 @@
 	* rt/netscape/javascript/JSRunnable.java: Same.
 	* rt/netscape/javascript/JSUtil.java: Same.
 
+2008-09-22  Lillian Angel  <langel@redhat.com>
+			DJ Lucas  <dj@linuxfromscratch.org>
+
+		* Makefile.am: Added new env var JAR_ACCEPTS_STDIN_LIST.
+		* acinclude.m4: Added check to determine whether jar supports
+		stdin file args.
+		* patches/icedtea-ecj.patch: Updated patch.
+		* AUTHORS: Added DJ Lucas.
+
 2008-09-18  Lillian Angel  <langel@redhat.com>
 
 	* AUTHORS: Added Marc Schoenefeld.
--- a/Makefile.am	Wed Sep 24 11:35:01 2008 -0400
+++ b/Makefile.am	Wed Sep 24 11:44:16 2008 -0400
@@ -228,7 +228,8 @@
 	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" \
 	"JAVAC=" \
 	"RHINO_JAR=$(RHINO_JAR)" \
-	"JAR_KNOWS_ATFILE=$(JAR_KNOWS_ATFILE)"
+	"JAR_KNOWS_ATFILE=$(JAR_KNOWS_ATFILE)" \
+	"JAR_ACCEPTS_STDIN_LIST=$(JAR_ACCEPTS_STDIN_LIST)"
 
 if WITH_CACAO
 ICEDTEA_ENV_ECJ += \
--- a/acinclude.m4	Wed Sep 24 11:35:01 2008 -0400
+++ b/acinclude.m4	Wed Sep 24 11:44:16 2008 -0400
@@ -342,9 +342,18 @@
     JAR_KNOWS_ATFILE=
     AC_MSG_RESULT(no)
   fi
+  AC_MSG_CHECKING([whether jar supports stdin file arguments])
+  if cat _config.list | $JAR cf@ _config.jar 2>/dev/null; then
+    JAR_ACCEPTS_STDIN_LIST=1
+    AC_MSG_RESULT(yes)
+  else
+    JAR_ACCEPTS_STDIN_LIST=
+    AC_MSG_RESULT(no)
+  fi
   rm -f _config.txt _config.list _config.jar
   AC_SUBST(JAR)
   AC_SUBST(JAR_KNOWS_ATFILE)
+  AC_SUBST(JAR_ACCEPTS_STDIN_LIST)
 ])
 
 AC_DEFUN([FIND_RMIC],
--- a/patches/icedtea-ecj.patch	Wed Sep 24 11:35:01 2008 -0400
+++ b/patches/icedtea-ecj.patch	Wed Sep 24 11:44:16 2008 -0400
@@ -428,32 +428,35 @@
  endif
  
  # Override of what javac to use (see deploy workspace)
---- oipenjdk/jdk/make/common/Release.gmk	2007-11-13 16:47:23.000000000 -0500
-+++ openjdk-ecj/jdk/make/common/Release.gmk	2007-11-13 16:48:08.000000000 -0500
-@@ -655,10 +649,19 @@
+--- oipenjdk/jdk/make/common/Release.gmk	2008-08-28 03:10:47.000000000 -0500
++++ openjdk-ecj/jdk/make/common/Release.gmk	2008-09-16 17:53:16.000000000 -0500
+@@ -655,10 +655,23 @@
  $(RES_JAR_ARGLIST): $(RES_JAR_FILELIST)
  	$(prep-target)
  	$(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
 -$(RESOURCES_JAR): $(RES_JAR_ARGLIST) $(JAR_MANIFEST_FILE)
--	$(prep-target)
 +$(RESOURCES_JAR): \
 +    $(if $(JAR_KNOWS_ATFILE),$(RES_JAR_FILELIST),$(RES_JAR_ARGLIST)) \
 +    $(JAR_MANIFEST_FILE)
-+	$(prep-target)
+ 	$(prep-target)
 +ifneq (,$(JAR_KNOWS_ATFILE))
++	(cd $(CLASSBINDIR) && \
+ 	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
+-	    @$(RES_JAR_ARGLIST) $(JAR_JFLAGS)
++	    $(JAR_JFLAGS) @$(RES_JAR_FILELIST))
++else ifneq (,$(JAR_ACCEPTS_STDIN_LIST))
 +	(cd $(CLASSBINDIR) && $(CAT) $(RES_JAR_FILELIST) | \
 +	$(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \
 +	    $(JAR_JFLAGS))
 +else
 +	(cd $(CLASSBINDIR) && \
- 	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
--	    @$(RES_JAR_ARGLIST) $(JAR_JFLAGS)
++	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
 +	    $(JAR_JFLAGS) `cat $(RES_JAR_FILELIST)`)
 +endif
  	@$(java-vm-cleanup)
  
  # Create jsse.jar containing SunJSSE implementation classes
-@@ -714,10 +717,18 @@
+@@ -714,10 +727,22 @@
  $(RT_JAR_ARGLIST): $(RT_JAR_FILELIST)
  	$(prep-target)
  	$(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
@@ -462,13 +465,17 @@
 +    $(JAR_MANIFEST_FILE)
  	$(prep-target)
 +ifneq (,$(JAR_KNOWS_ATFILE))
++	(cd $(CLASSBINDIR) && \
+ 	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
+-	    @$(RT_JAR_ARGLIST) $(JAR_JFLAGS)
++	    $(JAR_JFLAGS) @$(RT_JAR_FILELIST))
++else ifneq (,$(JAR_ACCEPTS_STDIN_LIST))
 +	(cd $(CLASSBINDIR) && $(CAT) $(RT_JAR_FILELIST) | \
 +	$(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \
 +	    $(JAR_JFLAGS))
 +else
 +	(cd $(CLASSBINDIR) && \
- 	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
--	    @$(RT_JAR_ARGLIST) $(JAR_JFLAGS)
++	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
 +	    $(JAR_JFLAGS) `$(CAT) $(RT_JAR_FILELIST)`)
 +endif
  	@$(java-vm-cleanup)