Blame SOURCES/freetype-multilib.patch

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