RFC: PR600 HS19 upgrade broke CACAO build on ARM

Fri Feb 18 16:08:23 PST 2011

On 16:11 Fri 18 Feb     , Xerxes Rånby wrote:
> On 2011-02-18 15:25, Gary Benson wrote:
> > Dr Andrew John Hughes wrote:
> >> On 12:20 Fri 18 Feb     , Xerxes Rånby wrote:
> >>> When building icedtea6 with --enable-cacao  on ARM then the build break with the error message:
> >>>
> >>> make[7]: *** No rule to make target `../../../../src/solaris/bin/arm/jvm.cfg', needed by `/var/lib/buildbot/icedtea/icedtea6-natty-armv7l-quick-cacao/build/openjdk.build/lib/arm/jvm.cfg'.  Stop.
> >>>
> >>> The CACAO maintainer Stefan Ring have found out that it are
> >>> possible to build CACAO on ARM if ICEDTEA_ZERO_BUILD gets sets
> >>> to true.
> >>> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=600
> >>>
> >>> The attached patch unbreaks CACAO on ARM builds.
> >>> Ok to push?
> >> No.  I think it should be fixed correctly, not just by enabling
> >> the zero build.  Do you know if this is because something we do
> >> in IcedTea for zero? Or something in OpenJDK?
> > You need to create the file jdk/src/solaris/bin/arm/jvm.cfg before
> > building.  The other platforms (zero included) have their own files
> > there.  Setting ZERO_BUILD=true enables some logic that causes the
> > file to be copied from jdk/src/solaris/bin/zero/jvm.cfg rather than
> > jdk/src/solaris/bin/$(ARCH)/jvm.cfg.
> >
> > Cheers,
> > Gary
> >
> Thanks a lot Gary for pointing this missing file out and also thank you Andrew for the review!
> I have attached a new patch that simply creates the missing openjdk/jdk/src/solaris/bin/arm/jvm.cfg if BUILD_CACAO are defined.
> 
> Ok to push?
> 

Ok by me.  Out of interest, do you know if hs20 now also works?

> Cheers,
> Xerxes

> Index: icedtea6/ChangeLog
> ===================================================================
> --- icedtea6.orig/ChangeLog	2011-02-18 15:26:52.000000000 +0100
> +++ icedtea6/ChangeLog	2011-02-18 15:38:09.000000000 +0100
> @@ -1,3 +1,11 @@
> +2011-02-18  Xerxes Ranby  <xerxes at zafena.se>
> +
> +	PR600: HS19 upgrade broke CACAO build on ARM
> +	* Makefile.am (ICEDTEA_PATCHES):
> +	Add patch if BUILD_CACAO are defined.
> +	* NEWS: Updated.
> +	* patches/cacao/arm-jvm.cfg-pr600.patch
> +
>  2011-02-18  Pavel Tisnovsky  <ptisnovs at redhat.com>
>  
>  	* Makefile.am: Updated.
> Index: icedtea6/Makefile.am
> ===================================================================
> --- icedtea6.orig/Makefile.am	2011-02-18 15:34:45.000000000 +0100
> +++ icedtea6/Makefile.am	2011-02-18 15:36:33.000000000 +0100
> @@ -326,7 +326,8 @@
>  	patches/cacao/launcher.patch \
>  	patches/cacao/arm-arch-defines.patch \
>  	patches/cacao/jsig.patch \
> -	patches/cacao/memory.patch
> +	patches/cacao/memory.patch \
> +	patches/cacao/arm-jvm.cfg-pr600.patch
>  endif
>  
>  if WITH_CACAO
> Index: icedtea6/NEWS
> ===================================================================
> --- icedtea6.orig/NEWS	2011-02-18 15:31:30.000000000 +0100
> +++ icedtea6/NEWS	2011-02-18 15:33:14.000000000 +0100
> @@ -426,6 +426,7 @@
>    - S6444769: java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html fails
>  * Bug fixes
>    - RH661505: JPEGs with sRGB IEC61966-2.1 color profiles have wrong colors
> +  - PR600: HS19 upgrade broke CACAO build on ARM
>    - PR616, PR99: Don't statically link libstdc++ or libgcc
>    - PR632: patches/security/20110215/6878713.patch breaks shark zero build
>  
> Index: icedtea6/patches/cacao/arm-jvm.cfg-pr600.patch
> ===================================================================
> --- /dev/null	1970-01-01 00:00:00.000000000 +0000
> +++ icedtea6/patches/cacao/arm-jvm.cfg-pr600.patch	2011-02-18 15:39:29.000000000 +0100
> @@ -0,0 +1,44 @@
> +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

-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D  0698 0713 C3ED F586 2A37