RFR: 8234370: Implementation of JEP 362: Deprecate the Solaris and SPARC Ports

[John Paul Adrian Glaubitz]

Hi!

On 12/15/19 10:13 AM, John Paul Adrian Glaubitz wrote:
> The change for JDK-8234370 also triggers for Zero which is not correct.
> 
> It should trigger for the normal build only.
> 
> I will file a bug report.

I have filed JDK-8235960 now, but I haven't managed to come up with a working fix
yet.

I tried both variants as below, but autoconf is failing me when I try to regenerate
configure.

Can anyone remind me what the proper way of regenerating the configure script is
these days?

Thanks,
Adrian

glaubitz at gcc202:~/jdk$ hg diff
diff -r eefd0a71c160 make/autoconf/platform.m4
--- a/make/autoconf/platform.m4 Sat Dec 14 13:50:34 2019 +0800
+++ b/make/autoconf/platform.m4 Sun Dec 15 12:46:47 2019 +0300
@@ -566,7 +566,7 @@
   AC_ARG_ENABLE(deprecated-ports, [AS_HELP_STRING([--enable-deprecated-ports@<:@=yes/no@:>@],
        [Suppress the error when configuring for a deprecated port @<:@no@:>@])])
 
-  if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_CPU_ARCH" = xsparc; then
+  if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_CPU_ARCH" = xsparc && test "x$JVM_VARIANTS" != xzero; then
     if test "x$enable_deprecated_ports" = "xyes"; then
       AC_MSG_WARN([The Solaris and SPARC ports are deprecated and may be removed in a future release.])
     else
glaubitz at gcc202:~/jdk$

glaubitz at gcc202:~/jdk$ hg diff
diff -r eefd0a71c160 make/autoconf/platform.m4
--- a/make/autoconf/platform.m4 Sat Dec 14 13:50:34 2019 +0800
+++ b/make/autoconf/platform.m4 Sun Dec 15 12:47:35 2019 +0300
@@ -566,7 +566,7 @@
   AC_ARG_ENABLE(deprecated-ports, [AS_HELP_STRING([--enable-deprecated-ports@<:@=yes/no@:>@],
        [Suppress the error when configuring for a deprecated port @<:@no@:>@])])
 
-  if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_CPU_ARCH" = xsparc; then
+  if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_CPU_ARCH" = xsparc && ! HOTSPOT_CHECK_JVM_VARIANT(zero); then
     if test "x$enable_deprecated_ports" = "xyes"; then
       AC_MSG_WARN([The Solaris and SPARC ports are deprecated and may be removed in a future release.])
     else
glaubitz at gcc202:~/jdk$

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaubitz at debian.org
`. `'   Freie Universitaet Berlin - glaubitz at physik.fu-berlin.de
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913