Skip to content

8386092: Implement JEP: Deprecate the macOS/x64 Port for Removal #31684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vidmik wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −2
Open

8386092: Implement JEP: Deprecate the macOS/x64 Port for Removal #31684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
9 changes: 8 additions & 1 deletion make/autoconf/platform.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
1 change: 1 addition & 0 deletions make/conf/jib-profiles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down