From fdfbfb2f8b4a07f8c355f2d6e5a372ddc9e2b962 Mon Sep 17 00:00:00 2001
From: Volker Simonis <simonis@openjdk.org>
Date: Thu, 8 Nov 2018 12:24:08 +0100
Subject: [PATCH] 8213515: Improve freetype detection on
 linux/ppc64/ppc64le/s390x

Reviewed-by: shade, ihse, stuefe
---
 make/autoconf/lib-freetype.m4 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/make/autoconf/lib-freetype.m4 b/make/autoconf/lib-freetype.m4
index 4a2c971c7bc..d3cb51543de 100644
--- a/make/autoconf/lib-freetype.m4
+++ b/make/autoconf/lib-freetype.m4
@@ -186,6 +186,9 @@ AC_DEFUN_ONCE([LIB_SETUP_FREETYPE],
           FREETYPE_BASE_DIR="$SYSROOT/usr"
           if (test "x$OPENJDK_TARGET_CPU_BITS" = "x64"); then
             LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/$OPENJDK_TARGET_CPU-linux-gnu], [well-known location])
+            if (test "x$FOUND_FREETYPE" != "xyes"); then
+              LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib64], [well-known location])
+            fi
           else
             LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/i386-linux-gnu], [well-known location])
             if (test "x$FOUND_FREETYPE" != "xyes"); then