Mercurial > hg > icedtea6

changeset 2244:b1cf18e3cb6c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix hotspot build with small SC_ARG_MAX 2010-08-27 Matthias Klose <doko@ubuntu.com> * patches/icedtea-too-many-args.diff: Fix build failure with small SC_ARG_MAX. * Makefile.am (ICEDTEA_PATCHES): Apply the above. * patches/ecj/icedtea-hotspot.patch: Update.
author doko@ubuntu.com
date Fri, 27 Aug 2010 23:59:00 +0200
parents bf50b9b4cfa8
children 133ae13dda61
files ChangeLog Makefile.am patches/ecj/icedtea-hotspot.patch
diffstat 3 files changed, 16 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Aug 27 23:46:48 2010 +0200
+++ b/ChangeLog	Fri Aug 27 23:59:00 2010 +0200
@@ -1,3 +1,10 @@
+2010-08-27  Matthias Klose  <doko@ubuntu.com>
+
+	* patches/icedtea-too-many-args.diff: Fix build failure with
+	small SC_ARG_MAX.
+	* Makefile.am (ICEDTEA_PATCHES): Apply the above.
+	* patches/ecj/icedtea-hotspot.patch: Update.
+
 2010-08-27  Matthias Klose  <doko@ubuntu.com>
 
 	* Makefile.am: Bump cacao version to changeset including build
--- a/Makefile.am	Fri Aug 27 23:46:48 2010 +0200
+++ b/Makefile.am	Fri Aug 27 23:59:00 2010 +0200
@@ -290,7 +290,8 @@
 	patches/openjdk/6795060-icu_crash.patch \
 	patches/openjdk/4356282-opentype.patch \
 	patches/openjdk/6954424-opentype_javadoc.patch \
-	patches/openjdk/6438179-systray_check.patch
+	patches/openjdk/6438179-systray_check.patch \
+	patches/icedtea-too-many-args.diff
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
--- a/patches/ecj/icedtea-hotspot.patch	Fri Aug 27 23:46:48 2010 +0200
+++ b/patches/ecj/icedtea-hotspot.patch	Fri Aug 27 23:59:00 2010 +0200
@@ -1,14 +1,14 @@
 diff -Nru openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make openjdk-ecj/hotspot/make/linux/makefiles/sa.make
 --- openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make	2010-03-29 21:34:15.000000000 +0100
 +++ openjdk-ecj/hotspot/make/linux/makefiles/sa.make	2010-03-29 21:41:28.000000000 +0100
-@@ -74,8 +74,8 @@
- 	  mkdir -p $(SA_CLASSDIR);        \
- 	fi
+@@ -80,8 +80,8 @@
+ 	$(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)
--	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2)
-+	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1)
-+	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2)
+-	$(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.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
++	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -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)