From 0ccef680ed648e07599ada3c9ebf7f205ebc06a3 Mon Sep 17 00:00:00 2001 From: Morgan Davies Date: Thu, 28 May 2020 12:12:14 +0100 Subject: [PATCH] Build JDK11 and upwards with freetype 2.10.2 * Freetype 2.10.2 can only be used with TOOLCHAIN=2017 * Freetype is set to use version 2.10.2 unless overriden in windows.sh Signed-off-by: Morgan Davies --- build-farm/platform-specific-configurations/windows.sh | 7 +------ sbin/common/config_init.sh | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/build-farm/platform-specific-configurations/windows.sh b/build-farm/platform-specific-configurations/windows.sh index e8fbc07415..6dd8c075cb 100755 --- a/build-farm/platform-specific-configurations/windows.sh +++ b/build-farm/platform-specific-configurations/windows.sh @@ -99,11 +99,7 @@ then TOOLCHAIN_VERSION="2013" export BUILD_ARGS="${BUILD_ARGS} --freetype-version 2.5.3" export PATH="/cygdrive/c/openjdk/make-3.82/:$PATH" - elif [ "${JAVA_TO_BUILD}" == "${JDK11_VERSION}" ] - then - TOOLCHAIN_VERSION="2013" - export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --disable-ccache" - elif [ "$JAVA_FEATURE_VERSION" -gt 11 ] + elif [ "$JAVA_FEATURE_VERSION" -ge 11 ] then TOOLCHAIN_VERSION="2017" export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --disable-ccache" @@ -116,7 +112,6 @@ then if [ "${VARIANT}" == "${BUILD_VARIANT_OPENJ9}" ] then export HAS_AUTOCONF=1 - export BUILD_ARGS="${BUILD_ARGS} --freetype-version 2.5.3" if [ "${JAVA_TO_BUILD}" == "${JDK8_VERSION}" ] then diff --git a/sbin/common/config_init.sh b/sbin/common/config_init.sh index e295adcbf1..ed53ddacbb 100755 --- a/sbin/common/config_init.sh +++ b/sbin/common/config_init.sh @@ -342,7 +342,7 @@ function configDefaults() { BUILD_CONFIG[COPY_MACOSX_FREE_FONT_LIB_FOR_JRE_FLAG]="false" BUILD_CONFIG[FREETYPE]=true BUILD_CONFIG[FREETYPE_DIRECTORY]="" - BUILD_CONFIG[FREETYPE_FONT_VERSION]="2.9.1" + BUILD_CONFIG[FREETYPE_FONT_VERSION]="2.10.2" BUILD_CONFIG[FREETYPE_FONT_BUILD_TYPE_PARAM]="" case "${BUILD_CONFIG[OS_KERNEL_NAME]}" in