diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 57f81f7fd51ee..6151bef13d9c3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -60,7 +60,7 @@ jobs: runs-on: ubuntu-24.04 env: # List of platforms to exclude by default - EXCLUDED_PLATFORMS: 'alpine-linux-x64' + EXCLUDED_PLATFORMS: 'alpine-linux-x64,macos-x64' outputs: linux-x64: ${{ steps.include.outputs.linux-x64 }} linux-x64-variants: ${{ steps.include.outputs.linux-x64-variants }} diff --git a/make/autoconf/platform.m4 b/make/autoconf/platform.m4 index 28aea489f7ec4..1ccdc44da25e9 100644 --- a/make/autoconf/platform.m4 +++ b/make/autoconf/platform.m4 @@ -660,7 +660,14 @@ 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@:>@])]) - # There are no deprecated ports. Implement the deprecation warnings here. + if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then + if test "x$enable_deprecated_ports" = "xyes"; then + AC_MSG_WARN([The macOS/x64 port is deprecated and may be removed in a future release.]) + else + AC_MSG_ERROR(m4_normalize([The macOS/x64 port is deprecated and may be removed in a future release. + Use --enable-deprecated-ports to suppress this error.])) + fi + fi ]) AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_OS_VERSION], diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js index 20315cda97d2b..657bd6e08b821 100644 --- a/make/conf/jib-profiles.js +++ b/make/conf/jib-profiles.js @@ -416,6 +416,7 @@ var getJibProfilesProfiles = function (input, common, data) { "--with-zlib=system", "--with-macosx-version-max=11.00.00", "--enable-compatible-cds-alignment", + "--enable-deprecated-ports", // Use system SetFile instead of the one in the devkit as the // devkit one may not work on Catalina. "SETFILE=/usr/bin/SetFile"