Skip to content
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

8286623: Bundle zlib by default with JDK on macos aarch64 #8675

Closed
wants to merge 2 commits into from
+4 −2
Closed

8286623: Bundle zlib by default with JDK on macos aarch64 #8675

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16e3fca
default to bundled zlib on macos aarch64
jaikiran May 12, 2022
32fd6a5
jib profile - don't explicitly set system zlib for macosx-aarch64
jaikiran Apr 29, 2022
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
4 changes: 3 additions & 1 deletion make/autoconf/lib-bundled.m4
View file
Original file line number Diff line number Diff line change
@@ -166,7 +166,9 @@ AC_DEFUN_ONCE([LIB_SETUP_ZLIB],

DEFAULT_ZLIB=system
if test "x$OPENJDK_TARGET_OS" = xwindows -o "x$OPENJDK_TARGET_OS" = xaix; then
# On windows and aix default is bundled, on others default is system
# On windows and aix default is bundled
DEFAULT_ZLIB=bundled
elif test "x$OPENJDK_TARGET_OS" = xmacosx -a "x$OPENJDK_TARGET_CPU" = xaarch64; then
DEFAULT_ZLIB=bundled
fi

2 changes: 1 addition & 1 deletion make/conf/jib-profiles.js
View file
Original file line number Diff line number Diff line change
@@ -450,7 +450,7 @@ var getJibProfilesProfiles = function (input, common, data) {
target_os: "macosx",
target_cpu: "aarch64",
dependencies: ["devkit", "gtest", "pandoc"],
configure_args: concat(common.configure_args_64bit, "--with-zlib=system",
configure_args: concat(common.configure_args_64bit,
"--with-macosx-version-max=11.00.00"),
},