From: Victor Martinez <pitillo@ono.com>
Date: Wed, 17 Feb 2010 09:35:18 +0000 (+0000)
Subject: imlib2: Fixed freetype and X link to clfs instead of host libs/includes
X-Git-Url: http://gitweb/?a=commitdiff_plain;h=e5ddbb4e0b51b2f9e9512d14252e2c9d13a39c12;p=attic%2Fports%2Fopt-cross.git

imlib2: Fixed freetype and X link to clfs instead of host libs/includes
---

diff --git a/imlib2/Pkgfile b/imlib2/Pkgfile
index 787e3e9..a6f09a7 100644
--- a/imlib2/Pkgfile
+++ b/imlib2/Pkgfile
@@ -23,7 +23,9 @@ build() {
   export BZ2LIBS="$DEFAULT_LIBS"
   export ZLIBLIBS="$DEFAULT_LIBS"
   export X_LIBS="$DEFAULT_LIBS -lX11 -lXext -lSM"
-
+  export my_libs="-lfreetype -lz -L$CLFS/usr/lib/X11 -lX11 -lXext -ldl -lm"
+  export my_includes="-I$CLFS/usr/include/freetype2 -I$CLFS/usr/include/X11"
+  
   ./configure --build=$CHOST \
               --host=$CTARGET \
               --prefix=/usr \
@@ -34,8 +36,16 @@ build() {
               --with-bzip2 \
               --with-zlib \
               --with-x \
-              --without-id3
+              --without-id3 \
+              --x-includes=$CLFS/usr/include/X11 \
+              --x-libraries=$CLFS/usr/lib/X11
 
+  sed "s|-L/usr/X11R6/lib|-L$CLFS/usr/lib/X11|g" -i imlib2-config
+  find -type f -name 'Makefile*' \
+    -exec sed -e "s|-I/usr/include|-I$CLFS/usr/include|g" \
+    -e "s|-L/usr/X11R6/lib|-L$CLFS/usr/lib/X11|g" \
+    -e "s|-L/usr/lib|-L$CLFS/usr/lib|g" -i {} \;
+  
   make
   make DESTDIR=$PKG install
 }