* [gentoo-commits] gentoo-x86 commit in dev-java/icedtea/files: icedtea-6.1.11.1-cacao_jvm.cfg.patch
@ 2012-03-29 19:26 Ralph Sennhauser (sera)
0 siblings, 0 replies; 2+ messages in thread
From: Ralph Sennhauser (sera) @ 2012-03-29 19:26 UTC (permalink / raw
To: gentoo-commits
sera 12/03/29 19:26:56
Added: icedtea-6.1.11.1-cacao_jvm.cfg.patch
Log:
Add upstream patch for builing cacao on ppc(64). #403159
Put back ~ppc ~ppc64 for IcedTea 6 1.11 branch.
(Portage version: 2.1.10.51/cvs/Linux x86_64)
Revision Changes Path
1.1 dev-java/icedtea/files/icedtea-6.1.11.1-cacao_jvm.cfg.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/files/icedtea-6.1.11.1-cacao_jvm.cfg.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea/files/icedtea-6.1.11.1-cacao_jvm.cfg.patch?rev=1.1&content-type=text/plain
Index: icedtea-6.1.11.1-cacao_jvm.cfg.patch
===================================================================
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 \
@@ -982,6 +981,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/acinclude.m4 b/acinclude.m4
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -863,6 +863,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.cfg.in b/jvm.cacao.cfg.in
copy from jvm.cfg.in
copy to jvm.cacao.cfg.in
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
--- /dev/null 2012-03-07 15:45:21.947999929 +0000
+++ a/jvm.cacao.cfg.in 2012-03-16 12:58:18.683839114 +0000
@@ -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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-java/icedtea/files: icedtea-6.1.11.1-cacao_jvm.cfg.patch
@ 2012-06-19 21:02 Ralph Sennhauser (sera)
0 siblings, 0 replies; 2+ messages in thread
From: Ralph Sennhauser (sera) @ 2012-06-19 21:02 UTC (permalink / raw
To: gentoo-commits
sera 12/06/19 21:02:26
Removed: icedtea-6.1.11.1-cacao_jvm.cfg.patch
Log:
Drop 1.10 and 2.0 branches.
(Portage version: 2.1.10.65/cvs/Linux x86_64)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-06-19 21:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-19 21:02 [gentoo-commits] gentoo-x86 commit in dev-java/icedtea/files: icedtea-6.1.11.1-cacao_jvm.cfg.patch Ralph Sennhauser (sera)
-- strict thread matches above, loose matches on Subject: below --
2012-03-29 19:26 Ralph Sennhauser (sera)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox