/hg/release/icedtea6-1.8: 2010-08-27 Matthias Klose <doko at ubun...
doko at icedtea.classpath.org
doko at icedtea.classpath.org
Sat Aug 28 04:11:28 PDT 2010
changeset 9aa28151c299 in /hg/release/icedtea6-1.8
details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=9aa28151c299
author: doko at ubuntu.com
date: Sat Aug 28 13:10:53 2010 +0200
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:
4 files changed, 60 insertions(+), 5 deletions(-)
ChangeLog | 7 +++++
Makefile.am | 3 +-
patches/ecj/icedtea-hotspot.patch | 8 ++---
patches/icedtea-too-many-args.patch | 47 +++++++++++++++++++++++++++++++++++
diffs (96 lines):
diff -r 73442a614b23 -r 9aa28151c299 ChangeLog
--- a/ChangeLog Fri Aug 27 14:50:02 2010 -0400
+++ b/ChangeLog Sat Aug 28 13:10:53 2010 +0200
@@ -1,3 +1,10 @@ 2010-08-27 Deepak Bhole <dbhole at redhat.
+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 Deepak Bhole <dbhole at redhat.com>
Fixes rhbz#560193
diff -r 73442a614b23 -r 9aa28151c299 Makefile.am
--- a/Makefile.am Fri Aug 27 14:50:02 2010 -0400
+++ b/Makefile.am Sat Aug 28 13:10:53 2010 +0200
@@ -331,7 +331,8 @@ ICEDTEA_PATCHES = \
patches/icedtea-override-redirect-metacity.patch \
patches/openjdk/6678385.patch \
patches/fonts-gentoo.patch \
- patches/fonts-rhel.patch
+ patches/fonts-rhel.patch \
+ patches/icedtea-too-many-args.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -r 73442a614b23 -r 9aa28151c299 patches/ecj/icedtea-hotspot.patch
--- a/patches/ecj/icedtea-hotspot.patch Fri Aug 27 14:50:02 2010 -0400
+++ b/patches/ecj/icedtea-hotspot.patch Sat Aug 28 13:10:53 2010 +0200
@@ -5,10 +5,10 @@ diff -Nru openjdk-ecj.orig/hotspot/make/
mkdir -p $(SA_CLASSDIR); \
fi
-- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
-- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2)
-+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
-+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2)
+- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
+- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST)
++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -g -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)
diff -r 73442a614b23 -r 9aa28151c299 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 13:10:53 2010 +0200
@@ -0,0 +1,47 @@
+diff -ru openjdk_/hotspot/make/linux/makefiles/sa.make openjdk/hotspot/make/linux/makefiles/sa.make
+--- openjdk_/hotspot/make/linux/makefiles/sa.make 2010-05-02 22:35:19.000000000 +0200
++++ openjdk/hotspot/make/linux/makefiles/sa.make 2010-05-02 22:26:12.000000000 +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 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
+- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -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 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -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)
More information about the distro-pkg-dev
mailing list