* builds_unix_freetype-config_in_sysroot.diff:

	fixed sysroot handling


git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6708 33e552b5-05e3-0310-8538-816dae2090ed

1 files changed, 59 insertions, 14 deletions

diff --git a/patches/freetype-2.2.1/generic/builds_unix_freetype-config_in_sysroot.diff b/patches/freetype-2.2.1/generic/builds_unix_freetype-config_in_sysroot.diff
index d63c94826..d12bb4234 100644
--- a/patches/freetype-2.2.1/generic/builds_unix_freetype-config_in_sysroot.diff
+++ b/patches/freetype-2.2.1/generic/builds_unix_freetype-config_in_sysroot.diff
@@ -14,28 +14,73 @@
 # 
 # not commited, but should be :)
 #
-Index: freetype-2.1.10/builds/unix/freetype-config.in
+Index: freetype-2.2.1/builds/unix/freetype-config.in
 ===================================================================
---- freetype-2.1.10.orig/builds/unix/freetype-config.in
-+++ freetype-2.1.10/builds/unix/freetype-config.in
-@@ -9,7 +9,7 @@
- # indicate that you have read the license and understand and accept it
- # fully.
+--- freetype-2.2.1.orig/builds/unix/freetype-config.in
++++ freetype-2.2.1/builds/unix/freetype-config.in
+@@ -76,13 +76,13 @@ while test $# -gt 0 ; do
+     exit 0
+     ;;
+   --ftversion)
+-    major=`grep define @prefix@/include/freetype2/freetype/freetype.h \
++    major=`grep define ${SYSROOT}@prefix@/include/freetype2/freetype/freetype.h \
+            | grep FREETYPE_MAJOR \
+            | sed 's/.*[ 	]\([0-9][0-9]*\).*/\1/'`
+-    minor=`grep define @prefix@/include/freetype2/freetype/freetype.h \
++    minor=`grep define ${SYSROOT}@prefix@/include/freetype2/freetype/freetype.h \
+            | grep FREETYPE_MINOR \
+            | sed 's/.*[ 	]\([0-9][0-9]*\).*/\1/'`
+-    patch=`grep define @prefix@/include/freetype2/freetype/freetype.h \
++    patch=`grep define ${SYSROOT}@prefix@/include/freetype2/freetype/freetype.h \
+            | grep FREETYPE_PATCH \
+            | sed 's/.*[ 	]\([0-9][0-9]*\).*/\1/'`
+     echo $major.$minor.$patch
+@@ -111,11 +111,11 @@ if test "$local_prefix" = "yes" ; then
+ fi
  
--prefix=@prefix@
-+prefix=${SYSROOT}@prefix@
- exec_prefix=@exec_prefix@
- exec_prefix_set=no
- includedir=@includedir@
+ if test "$echo_prefix" = "yes" ; then
+-  echo $prefix
++  echo ${SYSROOT}$prefix
+ fi
+ 
+ if test "$echo_exec_prefix" = "yes" ; then
+-  echo $exec_prefix
++  echo ${SYSROOT}$exec_prefix
+ fi
+ 
+ if test "$exec_prefix_set" = "yes" ; then
+@@ -128,9 +128,9 @@ else
+ fi
+ 
+ if test "$echo_cflags" = "yes" ; then
+-  cflags="-I$includedir/freetype2"
+-  if test "$includedir" != "/usr/include" ; then
+-    echo $cflags -I$includedir
++  cflags="-I${SYSROOT}$includedir/freetype2"
++  if test "${SYSROOT}$includedir" != "/usr/include" ; then
++    echo $cflags -I${SYSROOT}$includedir
+   else
+     echo $cflags
+   fi
 @@ -141,9 +141,9 @@ if test "$echo_libs" = "yes" ; then
    if test "$enable_shared" = "yes" ; then
      eval "rpath=\"$hardcode_libdir_flag_spec\""
    fi
 -  libs="-lfreetype @LIBZ@"
-+  libs="-Wl,-lfreetype @LIBZ@"
-   if test "$libdir" != "/usr/lib" && test "$libdir" != "/usr/lib64"; then
+-  if test "$libdir" != "/usr/lib" && test "$libdir" != "/usr/lib64"; then
 -    echo -L$libdir $rpath $libs
-+    echo -L$libdir $libs
++  libs="-Wl,-lfreetype @LIBZ@"
++  if test "${SYSROOT}$libdir" != "/usr/lib" && test "${SYSROOT}$libdir" != "/usr/lib64"; then
++    echo -L${SYSROOT}$libdir $rpath $libs
    else
      echo $libs
    fi
+@@ -151,7 +151,7 @@ fi
+ 
+ if test "$echo_libtool" = "yes" ; then
+   convlib="libfreetype.la"
+-  echo $libdir/$convlib
++  echo ${SYSROOT}$libdir/$convlib
+ fi
+ 
+ # EOF