[patch] grub-2.02-freetype_pkgconfig.patch

grub-2.02-freetype_pkgconfig.patch (text/plain), 1.98 KB, created by Lars Wendler (Polynomial-C) (RETIRED) on 2018-05-04 12:05:00 UTC

From 074663a8402a14350d1771bd1613bc9c9b1995f4 Mon Sep 17 00:00:00 2001
From: Lars Wendler <[e-mail]>
Date: Fri, 4 May 2018 13:43:59 +0200
Subject: [PATCH] Use pkg-config to find freetype

As of freetype-2.9.1 the freetype-config script has been deprecated and
is no longer shipped by default.
---
 configure.ac | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index c7888e40f..01d94c0a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1510,7 +1510,8 @@ fi
 
 if test x"$grub_mkfont_excuse" = x ; then
   # Check for freetype libraries.
-  AC_CHECK_TOOLS([FREETYPE], [freetype-config])
+  PKG_PROG_PKG_CONFIG
+  PKG_CHECK_MODULES(FREETYPE2, freetype2, FREETYPE=yes)
   if test "x$FREETYPE" = x ; then
     grub_mkfont_excuse=["need freetype2 library"]
   fi
@@ -1520,8 +1521,8 @@ unset ac_cv_header_ft2build_h
 
 if test x"$grub_mkfont_excuse" = x ; then
   # Check for freetype libraries.
-  freetype_cflags=`$FREETYPE --cflags`
-  freetype_libs=`$FREETYPE --libs`
+  freetype_cflags="$FREETYPE2_CFLAGS"
+  freetype_libs="$FREETYPE2_LIBS"
   SAVED_CPPFLAGS="$CPPFLAGS"
   SAVED_LIBS="$LIBS"
   CPPFLAGS="$CPPFLAGS $freetype_cflags"
@@ -1573,7 +1574,8 @@ AC_SUBST([BUILD_WORDS_BIGENDIAN])
 
 if test x"$grub_build_mkfont_excuse" = x ; then
   # Check for freetype libraries.
-  AC_CHECK_PROGS([BUILD_FREETYPE], [freetype-config])
+  PKG_PROG_PKG_CONFIG
+  PKG_CHECK_MODULES(BUILD_FREETYPE2, freetype2, BUILD_FREETYPE=yes)
   if test "x$BUILD_FREETYPE" = x ; then
     grub_build_mkfont_excuse=["need freetype2 library"]
   fi
@@ -1581,8 +1583,8 @@ fi
 
 if test x"$grub_build_mkfont_excuse" = x ; then
   # Check for freetype libraries.
-  build_freetype_cflags=`$BUILD_FREETYPE --cflags`
-  build_freetype_libs=`$BUILD_FREETYPE --libs`
+  build_freetype_cflags="$BUILD_FREETYPE2_CFLAGS"
+  build_freetype_libs="$BUILD_FREETYPE2_LIBS"
   SAVED_CPPFLAGS_2="$CPPFLAGS"
   SAVED_LIBS="$LIBS"
   CPPFLAGS="$CPPFLAGS $build_freetype_cflags"
-- 
2.17.0