Blame SOURCES/freetype-2.8-multilib.patch

f1a3e6
--- freetype-2.9/builds/unix/freetype-config.in
f1a3e6
+++ freetype-2.9/builds/unix/freetype-config.in
f1a3e6
@@ -13,45 +13,25 @@ LC_ALL=C
f1a3e6
 export LC_ALL
f1a3e6
 
f1a3e6
 
f1a3e6
-# if `pkg-config' is available, use values from `freetype2.pc'
f1a3e6
-%PKG_CONFIG% --atleast-pkgconfig-version 0.24 >/dev/null 2>&1
f1a3e6
-if test $? -eq 0 ; then
f1a3e6
-  # note that option `--variable' is not affected by the
f1a3e6
-  # PKG_CONFIG_SYSROOT_DIR environment variable
f1a3e6
-  if test "x$SYSROOT" != "x" ; then
f1a3e6
-    PKG_CONFIG_SYSROOT_DIR="$SYSROOT"
f1a3e6
-    export PKG_CONFIG_SYSROOT_DIR
f1a3e6
-  fi
f1a3e6
-
f1a3e6
-  prefix=`%PKG_CONFIG% --variable prefix freetype2`
f1a3e6
-  exec_prefix=`%PKG_CONFIG% --variable exec_prefix freetype2`
f1a3e6
-
f1a3e6
-  includedir=`%PKG_CONFIG% --variable includedir freetype2`
f1a3e6
-  libdir=`%PKG_CONFIG% --variable libdir freetype2`
f1a3e6
-
f1a3e6
-  version=`%PKG_CONFIG% --modversion freetype2`
f1a3e6
-
f1a3e6
-  cflags=`%PKG_CONFIG% --cflags freetype2`
f1a3e6
-  dynamic_libs=`%PKG_CONFIG% --libs freetype2`
f1a3e6
-  static_libs=`%PKG_CONFIG% --static --libs freetype2`
f1a3e6
-else
f1a3e6
-  prefix="%prefix%"
f1a3e6
-  exec_prefix="%exec_prefix%"
f1a3e6
-
f1a3e6
-  includedir="%includedir%"
f1a3e6
-  libdir="%libdir%"
f1a3e6
-
f1a3e6
-  version=%ft_version%
f1a3e6
-
f1a3e6
-  cflags="-I${SYSROOT}$includedir/freetype2"
f1a3e6
-  dynamic_libs="-lfreetype"
f1a3e6
-  static_libs="%LIBSSTATIC_CONFIG%"
f1a3e6
-  if test "${SYSROOT}$libdir" != "/usr/lib"   &&
f1a3e6
-     test "${SYSROOT}$libdir" != "/usr/lib64" ; then
f1a3e6
-    libs_L="-L${SYSROOT}$libdir"
f1a3e6
-  fi
f1a3e6
+# note that option `--variable' is not affected by the
f1a3e6
+# PKG_CONFIG_SYSROOT_DIR environment variable
f1a3e6
+if test "x$SYSROOT" != "x" ; then
f1a3e6
+  PKG_CONFIG_SYSROOT_DIR="$SYSROOT"
f1a3e6
+  export PKG_CONFIG_SYSROOT_DIR
f1a3e6
 fi
f1a3e6
 
f1a3e6
+prefix=`pkgconf --variable prefix freetype2`
f1a3e6
+exec_prefix=`pkgconf --variable exec_prefix freetype2`
f1a3e6
+
f1a3e6
+includedir=`pkgconf --variable includedir freetype2`
f1a3e6
+libdir=`pkgconf --variable libdir freetype2`
f1a3e6
+
f1a3e6
+version=`pkgconf --modversion freetype2`
f1a3e6
+
f1a3e6
+cflags=`pkgconf --cflags freetype2`
f1a3e6
+dynamic_libs=`pkgconf --libs freetype2`
f1a3e6
+static_libs=`pkgconf --static --libs freetype2`
f1a3e6
+
f1a3e6
 orig_prefix=$prefix
f1a3e6
 orig_exec_prefix=$exec_prefix
f1a3e6