Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8213515: Improve freetype detection on linux/ppc64/ppc64le/s390x
authorsimonis
Thu, 08 Nov 2018 12:24:08 +0100
changeset 52447 4547f8303f2d
parent 52446 187d16766a63
child 52448 bc5c7f63dbae
8213515: Improve freetype detection on linux/ppc64/ppc64le/s390x Reviewed-by: shade, ihse, stuefe
make/autoconf/lib-freetype.m4 file | annotate | diff | comparison | revisions 
--- a/make/autoconf/lib-freetype.m4	Thu Nov 08 12:03:18 2018 +0100
+++ b/make/autoconf/lib-freetype.m4	Thu Nov 08 12:24:08 2018 +0100
@@ -186,6 +186,9 @@
           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
jdk-sandbox