From 4e68ac9b15a0bf2f6cb1cf01109f651e35d32ad9 Mon Sep 17 00:00:00 2001
From: John Paul Adrian Glaubitz <glaubitz@openjdk.org>
Date: Tue, 17 Dec 2019 16:53:44 +0100
Subject: [PATCH] 8235960: Zero should not trigger the deprecation warning for
 ports

Reviewed-by: mikael
---
 make/autoconf/platform.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/autoconf/platform.m4 b/make/autoconf/platform.m4
index a5896b9df6c..9fd5bdc3ec7 100644
--- a/make/autoconf/platform.m4
+++ b/make/autoconf/platform.m4
@@ -566,7 +566,7 @@ AC_DEFUN([PLATFORM_CHECK_DEPRECATION],
   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$with_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