Blame SOURCES/freetype-multilib.patch

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