From a1c335e813b020d6b6ad7f31eb74cec36f81f64b Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 14 Jan 2010 15:36:37 +0000 Subject: [PATCH] xfe: Fixed xft link. --- xfe/Pkgfile | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/xfe/Pkgfile b/xfe/Pkgfile index b9893f3..88dd7c7 100644 --- a/xfe/Pkgfile +++ b/xfe/Pkgfile @@ -7,24 +7,31 @@ name=xfe version=1.32.1 -release=1 +release=2 source=(http://dl.sourceforge.net/sourceforge/xfe/$name-$version.tar.gz) build() { cd $name-$version - export FOXCFLAGS="-I$CLFS/usr/include -I$CLFS/usr/include/fox-1.6" - export CXXFLAGS="${CXXFLAGS} $FOXCFLAGS" export FOX_CONFIG="1" + + sed -e 's|`$FOX_CONFIG --libs \| grep Xft`|"-L$CLFS/usr/lib -lFOX-1.6 -lXext -lX11 -lXcursor -ldl -lXft -lXrender -lfontconfig -lfreetype -lX11 -lz -lpthread -lrt -ljpeg -lpng -ltiff -lz -lbz2 -lm"|g' \ + -e 's|`$FOX_CONFIG --cflags`|"-I$CLFS/usr/include/fox-1.6"|g' \ + -e 's|`$xft_config --cflags`|-I$CLFS/usr/include|g' \ + -e 's|`$xft_config --libs`|-L$CLFS/usr/lib -lXft|g' \ + -e 's|`$freetype_config --cflags`|"-I$CLFS/usr/include -I$CLFS/usr/include/freetype2"|g' \ + -e 's|`$freetype_config --libs`|"-L$CLFS/usr/lib -lfreetype"|g' -i configure + echo "ac_cv_func_malloc_0_nonnull=yes" > config.cache - ./configure --build=$CHOST \ --host=$CTARGET \ --prefix=/usr \ --disable-nls \ --mandir=$PKG/usr/man \ + --enable-release \ --cache-file=config.cache - + sed -e '/#undef malloc/d' -e '/#undef realloc/d' -i config.h.in + make make prefix=$PKG/usr install } -- 2.26.2