1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8286623: Bundle zlib by default with JDK on macos aarch64

Browse Source 
Reviewed-by: lancea, ihse, erikj
This commit is contained in:
Jaikiran Pai 2022-05-13 01:55:46 +00:00
parent 617ef541bb
commit c3bade2e08
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
make/autoconf/lib-bundled.m4
View File

@ -166,7 +166,9 @@ AC_DEFUN_ONCE([LIB_SETUP_ZLIB],
DEFAULT_ZLIB=system DEFAULT_ZLIB=system
if test "x$OPENJDK_TARGET_OS" = xwindows -o "x$OPENJDK_TARGET_OS" = xaix; then 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 DEFAULT_ZLIB=bundled
fi fi

2
make/conf/jib-profiles.js
View File

@ -450,7 +450,7 @@ var getJibProfilesProfiles = function (input, common, data) {
target_os: "macosx", target_os: "macosx",
target_cpu: "aarch64", target_cpu: "aarch64",
dependencies: ["devkit", "gtest", "pandoc"], 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"), "--with-macosx-version-max=11.00.00"),
}, },