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 <morgan.davies@ibm.com>
adoptium · May 28, 2020 · cc65cf0 · cc65cf0
1 parent 02649fc
commit cc65cf0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/build-farm/platform-specific-configurations/windows.sh b/build-farm/platform-specific-configurations/windows.sh
@@ -116,7 +116,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
@@ -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