/hg/icedtea6: Make HotSpot 19 the default. Update documentation...

[Matthias Klose]

On 19.10.2010 22:27, andrew at icedtea.classpath.org wrote:
> changeset 5327c5405c78 in /hg/icedtea6
> details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5327c5405c78
> author: Andrew John Hughes<ahughes at redhat.com>
> date: Tue Oct 19 21:27:47 2010 +0100
>
> 	Make HotSpot 19 the default. Update documentation to reflect recent
> 	changes.
>
> 	2010-10-19 Andrew John Hughes<ahughes at redhat.com>
>
> 	* INSTALL: Drop plugin dependencies. Document new
> 	JDK detection. Drop removed options from VisualVM and the
> 	plugin. Mention new hs19 default.
> 		* README: Updated. Remove sections on plugin and NetX.
> 	Update Zero&Shark section.
> 		* NEWS: Add HotSpot 19, NetX&  plugin removal, Shark
> 	upstreaming and JDK detection/bootstrapping changes.
> 		* acinclude.m4: (AC_CHECK_WITH_HOTSPOT_BUILD): Set
> 	DEFAULT_BUILD to hs19 rather than the non-existent hs16
> 	(used when
> 		--with-hotspot-build or
> 		--with-hotspot-build=yes is passed). Introduce
> 	ALTERNATE_BUILD to refer to the build enabled by --with-
> 	hotspot-build, which is 'original' (hs17) at present.

tested patch?

> diff -r a85679cc93f4 -r 5327c5405c78 acinclude.m4
> --- a/acinclude.m4	Tue Oct 19 19:55:35 2010 +0100
> +++ b/acinclude.m4	Tue Oct 19 21:27:47 2010 +0100
> @@ -917,7 +917,8 @@ AC_DEFUN([AC_CHECK_WITH_GCJ],
>
>   AC_DEFUN([AC_CHECK_WITH_HOTSPOT_BUILD],
>   [
> -  DEFAULT_BUILD="hs16"
> +  DEFAULT_BUILD="hs19"
> +  ALTERNATE_BUILD="original"
>     AC_MSG_CHECKING([which HotSpot build to use])
>     AC_ARG_WITH([hotspot-build],
>   	      [AS_HELP_STRING(--with-hotspot-build,the HotSpot build to use (see hotspot.map))],
> @@ -925,16 +926,16 @@ AC_DEFUN([AC_CHECK_WITH_HOTSPOT_BUILD],
>       HSBUILD="${withval}"
>     ],
>     [
> -    HSBUILD="original"
> +    HSBUILD="${DEFAULT_BUILD}"
>     ])
>     if test "x${HSBUILD}" = xyes; then
> +	HSBUILD="${ALTERNATE_BUILD}"
> +  elif test "x${HSBUILD}" = xno; then
>   	HSBUILD="${DEFAULT_BUILD}"
> -  elif test "x${HSBUILD}" = xno; then
> -	HSBUILD="original"
>     fi
>     AC_MSG_RESULT([${HSBUILD}])
>     AC_SUBST([HSBUILD])
> -  AM_CONDITIONAL(WITH_ALT_HSBUILD, test "x${HSBUILD}" != "xoriginal")
> +  AM_CONDITIONAL(WITH_ALT_HSBUILD, test "x${HSBUILD}" != "x${DEFAULT_BUILD}")
>   ])
>
>   AC_DEFUN([WITH_HOTSPOT_SRC_ZIP],

breaks the build, at least when configuring
--with-hotspot-build=hs19 --with-hotspot-src-zip=<file>

Checking patches/hotspot/hs19/gcc-suffix.patch
1 out of 1 hunk FAILED -- saving rejects to file 
openjdk/hotspot/make/linux/makefiles/gcc.make.rej
ERROR patch patches/hotspot/hs19/gcc-suffix.patch FAILED!
WARNING make clean-patch before retrying a fix
make[1]: *** [stamps/patch.stamp] Error 2

the hotspot tarball isn't unpacked.

reverting the patch lets the build run again