/hg/release/icedtea6-1.9: 2 new changesets
doko at icedtea.classpath.org
doko at icedtea.classpath.org
Sat Aug 28 04:00:32 PDT 2010
changeset 84253abe090d in /hg/release/icedtea6-1.9
details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=84253abe090d
author: doko at ubuntu.com
date: Sat Aug 28 00:03:59 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.
changeset 3714dbfe54a4 in /hg/release/icedtea6-1.9
details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=3714dbfe54a4
author: doko at ubuntu.com
date: Sat Aug 28 12:59:57 2010 +0200
Add missing file patches/icedtea-too-many-args.patch
diffstat:
4 files changed, 76 insertions(+), 22 deletions(-)
ChangeLog | 35 +++++++++++++++-----------
Makefile.am | 3 +-
patches/ecj/icedtea-hotspot.patch | 14 +++++-----
patches/icedtea-too-many-args.patch | 46 +++++++++++++++++++++++++++++++++++
diffs (144 lines):
diff -r f24a287fb69d -r 3714dbfe54a4 ChangeLog
--- a/ChangeLog Fri Aug 27 23:46:48 2010 +0200
+++ b/ChangeLog Sat Aug 28 12:59:57 2010 +0200
@@ -1,3 +1,23 @@ 2010-08-26 Pavel Tisnovsky <ptisnovs at r
+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
+ fixes for ARM and S390.
+ * patches/cacao/version-parsing.patch: Remove, applied upstream.
+
+2010-08-27 Deepak Bhole <dbhole at redhat.com>
+
+ Fixes rhbz#560193
+ * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+ (activateJars): Process nested jar only if size > 0 bytes.
+ * NEWS: Updated.
+
2010-08-26 Pavel Tisnovsky <ptisnovs at redhat.com>
* Makefile.am:
@@ -15,7 +35,7 @@ 2010-08-24 Omair Majid <omajid at redhat.
2010-08-23 Andrew Su <asu at redhat.com>
- * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
+ * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
(parse): Removed parsing for unknown <app> tag.
2010-08-09 Deepak Bhole <dbhole at redhat.com>
@@ -164,19 +184,6 @@ 2010-08-02 Andrew John Hughes <ahughes
* patches/fonts-gentoo.patch:
Add a font configuration for Gentoo
(currently a copy of Fedora's).
-
-2010-08-27 Matthias Klose <doko at ubuntu.com>
-
- * Makefile.am: Bump cacao version to changeset including build
- fixes for ARM and S390.
- * patches/cacao/version-parsing.patch: Remove, applied upstream.
-
-2010-08-27 Deepak Bhole <dbhole at redhat.com>
-
- Fixes rhbz#560193
- * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
- (activateJars): Process nested jar only if size > 0 bytes.
- * NEWS: Updated.
2010-07-30 Andrew John Hughes <ahughes at redhat.com>
diff -r f24a287fb69d -r 3714dbfe54a4 Makefile.am
--- a/Makefile.am Fri Aug 27 23:46:48 2010 +0200
+++ b/Makefile.am Sat Aug 28 12:59:57 2010 +0200
@@ -289,7 +289,8 @@ ICEDTEA_PATCHES = \
patches/fonts-rhel.patch \
patches/fonts-gentoo.patch \
patches/ipv4-mapped-ipv6-addresses.patch \
- patches/openjdk/6795060-icu_crash.patch
+ patches/openjdk/6795060-icu_crash.patch \
+ patches/icedtea-too-many-args.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -r f24a287fb69d -r 3714dbfe54a4 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 Sat Aug 28 12:59:57 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)
diff -r f24a287fb69d -r 3714dbfe54a4 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:59:57 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)
More information about the distro-pkg-dev
mailing list