[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openjdk-distro-pkg-dev
Subject:    /hg/icedtea6: Fix hotspot build with small SC_ARG_MAX
From:       doko () icedtea ! classpath ! org (doko at icedtea ! classpath ! org)
Date:       2010-08-27 21:59:31
Message-ID: hg.b1cf18e3cb6c.1282946371.2873452341184383832 () icedtea ! classpath ! org
[Download RAW message or body]

changeset b1cf18e3cb6c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b1cf18e3cb6c
author: doko at ubuntu.com
date: Fri Aug 27 23:59:00 2010 +0200

	Fix hotspot build with small SC_ARG_MAX

	2010-08-27 Matthias Klose <doko at 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.


diffstat:

3 files changed, 16 insertions(+), 8 deletions(-)
ChangeLog                         |    7 +++++++
Makefile.am                       |    3 ++-
patches/ecj/icedtea-hotspot.patch |   14 +++++++-------

diffs (52 lines):

diff -r bf50b9b4cfa8 -r b1cf18e3cb6c ChangeLog
--- 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 at ubuntu
+2010-08-27  Matthias Klose  <doko at 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 at ubuntu.com>
 
 	* Makefile.am: Bump cacao version to changeset including build
diff -r bf50b9b4cfa8 -r b1cf18e3cb6c Makefile.am
--- 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 @@ ICEDTEA_PATCHES = \
 	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 += \
diff -r bf50b9b4cfa8 -r b1cf18e3cb6c patches/ecj/icedtea-hotspot.patch
--- 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/
 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)


[prev in list] [next in list] [prev in thread] [next in thread]