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

Use bundled zlib instead of system for JDK21+ #3399

Merged
merged 1 commit into from
Jun 22, 2023
Merged

Use bundled zlib instead of system for JDK21+ #3399

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
9 changes: 9 additions & 0 deletions sbin/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,14 @@ configureFreetypeLocation() {
fi
}

configureZlibLocation() {
if [[ ! "${CONFIGURE_ARGS}" =~ "--with-zlib" ]]; then
if [[ "${BUILD_CONFIG[OPENJDK_FEATURE_NUMBER]}" -ge 21 ]]; then
addConfigureArg "--with-zlib=" "bundled"
fi
fi
}

# Configure the command parameters
configureCommandParameters() {
configureVersionStringParameter
Expand Down Expand Up @@ -526,6 +534,7 @@ configureCommandParameters() {
CONFIGURE_ARGS="${CONFIGURE_ARGS} ${BUILD_CONFIG[USER_SUPPLIED_CONFIGURE_ARGS]//temporary_speech_mark_placeholder/\"}"

configureFreetypeLocation
configureZlibLocation

echo "Completed configuring the version string parameter, config args are now: ${CONFIGURE_ARGS}"
}
Expand Down