[1.11] Backport PR886 to 1.11
Dr Andrew John Hughes
ahughes at redhat.com
Wed May 9 07:05:50 PDT 2012
1.11 includes a fix for CACAO that allows it to build on ARM by providing
a jvm.cfg file for it. The same issue that this patch solves still exists
on other platforms e.g. PPC, as that fix is architecture-specific.
I added a fix a while back to HEAD which generalises the fix, applying it
to all CACAO builds and this has been added to the Gentoo builds of 1.11
as well. I'd like to backport it to the 1.11 branch for the upcoming release.
This allows CACAO to build on PPC and fixes:
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=886
2012-03-16 Andrew John Hughes <ahughes at redhat.com>
PR600, 886:
* patches/pr600-arm-jvm.cfg.patch: Removed.
* Makefile.am:
(extract-openjdk): Copy jvm.cfg over if building cacao.
* acinclude.m4:
(IT_ENABLE_CACAO): Generate jvm.cacao.cfg.
* jvm.cacao.cfg.in: Copied from jvm.cfg.in.
Patch against 1.11 is attached. Ok for the 1.11 branch?
--
Andrew :)
Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)
PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07
-------------- next part --------------
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -332,7 +332,6 @@
patches/jtreg-LastErrorString.patch \
patches/openjdk/6663040-com.sun.awt.patch \
patches/openjdk/6775317-non-AA-simple-shape-performance.patch \
- patches/pr600-arm-jvm.cfg.patch \
patches/openjdk/6887494-NPE-in-pisces.patch \
patches/openjdk/6967436-6967433-floating-pt-conversion.patch \
patches/openjdk/6976265-stroke-control.patch \
@@ -976,6 +975,10 @@
fi
endif
endif
+if ENABLE_CACAO
+ mkdir -p openjdk/jdk/src/solaris/bin/$(JRE_ARCH_DIR)
+ cp jvm.cacao.cfg openjdk/jdk/src/solaris/bin/$(JRE_ARCH_DIR)/jvm.cfg
+endif
mkdir -p stamps
touch stamps/extract-openjdk.stamp
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,7 @@
- RH789154: javac error messages no longer contain the full path to the offending file:
- PR797: Compiler error message does not display entire file name and path
- PR881: Sign tests (wsse.policy.basic) failures with OpenJDK6
+ - PR886: 6-1.11.1 fails to build CACAO on ppc
* Backports
- S6792400: Avoid loading of Normalizer resources for simple uses
diff --git a/acinclude.m4 b/acinclude.m4
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -868,6 +868,7 @@
AC_MSG_RESULT(${ENABLE_CACAO})
AM_CONDITIONAL(ENABLE_CACAO, test x"${ENABLE_CACAO}" = "xyes")
AC_SUBST(ENABLE_CACAO)
+ AC_CONFIG_FILES([jvm.cacao.cfg])
])
AC_DEFUN([IT_WITH_CACAO_HOME],
diff --git a/jvm.cacao.cfg.in b/jvm.cacao.cfg.in
new file mode 100644
--- /dev/null
+++ b/jvm.cacao.cfg.in
@@ -0,0 +1,44 @@
+#
+# @(#)jvm.cfg 1.7 07/05/05
+#
+#
+# Copyright 2002-2003 Sun Microsystems, Inc. All Rights Reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+#
+#
+# List of JVMs that can be used as an option to java, javac, etc.
+# Order is important -- first in this list is the default JVM.
+# NOTE that this both this file and its format are UNSUPPORTED and
+# WILL GO AWAY in a future release.
+#
+# You may also select a JVM in an arbitrary location with the
+# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
+# and may not be available in a future release.
+#
+-server KNOWN
+-hotspot ERROR
+-classic WARN
+-client IGNORE
+-native ERROR
+-green ERROR
diff --git a/patches/pr600-arm-jvm.cfg.patch b/patches/pr600-arm-jvm.cfg.patch
deleted file mode 100644
--- a/patches/pr600-arm-jvm.cfg.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: openjdk/jdk/src/solaris/bin/arm/jvm.cfg
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ openjdk/jdk/src/solaris/bin/arm/jvm.cfg 2011-02-18 15:40:24.083043645 +0100
-@@ -0,0 +1,39 @@
-+# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# This code is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License version 2 only, as
-+# published by the Free Software Foundation. Oracle designates this
-+# particular file as subject to the "Classpath" exception as provided
-+# by Oracle in the LICENSE file that accompanied this code.
-+#
-+# This code is distributed in the hope that it will be useful, but WITHOUT
-+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+# version 2 for more details (a copy is included in the LICENSE file that
-+# accompanied this code).
-+#
-+# You should have received a copy of the GNU General Public License version
-+# 2 along with this work; if not, write to the Free Software Foundation,
-+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+#
-+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+# or visit www.oracle.com if you need additional information or have any
-+# questions.
-+#
-+#
-+# List of JVMs that can be used as an option to java, javac, etc.
-+# Order is important -- first in this list is the default JVM.
-+# NOTE that this both this file and its format are UNSUPPORTED and
-+# WILL GO AWAY in a future release.
-+#
-+# You may also select a JVM in an arbitrary location with the
-+# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
-+# and may not be available in a future release.
-+#
-+-server KNOWN
-+-client IGNORE
-+-hotspot ERROR
-+-classic WARN
-+-native ERROR
-+-green ERROR
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120509/993128a9/attachment.bin
More information about the distro-pkg-dev
mailing list