/hg/icedtea6: Add missing file patches/icedtea-too-many-args.patch

[doko at icedtea.classpath.org]

changeset 17e622c24432 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=17e622c24432
author: doko at ubuntu.com
date: Sat Aug 28 12:58:17 2010 +0200

	Add missing file patches/icedtea-too-many-args.patch


diffstat:

2 files changed, 47 insertions(+), 1 deletion(-)
Makefile.am                         |    2 -
patches/icedtea-too-many-args.patch |   46 +++++++++++++++++++++++++++++++++++

diffs (62 lines):

diff -r 133ae13dda61 -r 17e622c24432 Makefile.am
--- a/Makefile.am	Fri Aug 27 23:39:58 2010 +0100
+++ b/Makefile.am	Sat Aug 28 12:58:17 2010 +0200
@@ -292,7 +292,7 @@ ICEDTEA_PATCHES = \
 	patches/openjdk/6954424-opentype_javadoc.patch \
 	patches/openjdk/6438179-systray_check.patch \
 	patches/openjdk/6951319-sparc_build_fixes.patch \
-	patches/icedtea-too-many-args.diff
+	patches/icedtea-too-many-args.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r 133ae13dda61 -r 17e622c24432 patches/icedtea-too-many-args.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-too-many-args.patch	Sat Aug 28 12:58:17 2010 +0200
@@ -0,0 +1,46 @@
+--- openjdk/hotspot/make/linux/makefiles/sa.make.orig	2010-06-21 23:12:13.000000000 +0200
++++ openjdk/hotspot/make/linux/makefiles/sa.make	2010-06-28 01:11:27.022322578 +0200
+@@ -45,6 +45,9 @@
+ AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1))
+ AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2))
+ 
++AGENT_FILES1_LIST := $(TOPDIR)/../agent1.classes.list
++AGENT_FILES2_LIST := $(TOPDIR)/../agent2.classes.list
++
+ SA_CLASSDIR = $(GENERATED)/saclasses
+ 
+ SA_BUILD_VERSION_PROP = "sun.jvm.hotspot.runtime.VM.saBuildVersion=$(SA_BUILD_VERSION)"
+@@ -59,7 +62,7 @@
+ 	   $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
+ 	fi
+ 
+-$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2)
++$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2) agent_files_preclean
+ 	$(QUIETLY) echo "Making $@"
+ 	$(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
+ 	  echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
+@@ -74,8 +77,11 @@
+ 	  mkdir -p $(SA_CLASSDIR);        \
+ 	fi
+ 
+-	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1)
+-	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2)
++	$(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST)))
++	$(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST)))
++
++	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
++	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST)
+ 
+ 	$(QUIETLY) $(REMOTE) $(COMPILE.RMIC)  -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
+ 	$(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
+@@ -92,6 +98,10 @@
+ 	$(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.amd64.AMD64ThreadContext
+ 	$(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.sparc.SPARCThreadContext
+ 
++agent_files_preclean:
++	rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST)
++
+ clean:
+ 	rm -rf $(SA_CLASSDIR)
+ 	rm -rf $(GENERATED)/sa-jdi.jar
++	rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST)