diff --git a/make/autoconf/platform.m4 b/make/autoconf/platform.m4 index 134e7bb395b..0c987e9e9ab 100644 --- a/make/autoconf/platform.m4 +++ b/make/autoconf/platform.m4 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2023, 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 @@ -660,11 +660,10 @@ AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET], PLATFORM_CHECK_DEPRECATION ]) -AC_DEFUN_ONCE([PLATFORM_CHECK_DEPRECATION], +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@:>@])]) - AC_REQUIRE([PLATFORM_EXTRACT_TARGET_AND_BUILD]) if test "x$OPENJDK_TARGET_OS" = xwindows && test "x$OPENJDK_TARGET_CPU" = xx86; then if test "x$enable_deprecated_ports" = "xyes"; then AC_MSG_WARN([The Windows 32-bit x86 port is deprecated and may be removed in a future release.]) diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js index 75a00cc51e0..5baa2ce14e6 100644 --- a/make/conf/jib-profiles.js +++ b/make/conf/jib-profiles.js @@ -463,7 +463,8 @@ var getJibProfilesProfiles = function (input, common, data) { target_cpu: "x86", build_cpu: "x64", dependencies: ["devkit", "gtest"], - configure_args: concat(common.configure_args_32bit), + configure_args: concat(common.configure_args_32bit, + "--enable-deprecated-ports"), }, "windows-aarch64": {