Fix the fontconfig build.. had to add freetype-native for that to work well.

BKrev: 3fda6b3cujTT5_ygq34ooB3X1Bxraw

diff --git a/fontconfig/fontconfig_2.2.92.oe b/fontconfig/fontconfig_2.2.92.oe
index e69de29..c8c394d 100644 (file)
--- a/fontconfig/fontconfig_2.2.92.oe
+++ b/fontconfig/fontconfig_2.2.92.oe
@@ -0,0 +1,41 @@
+DESCRIPTION = A library for configuring and customizing font access.
+DEPENDS = virtual/libc expat freetype freetype-native
+RDEPENDS = libc6 expat freetype
+
+FC_SONAME = 1.0.4
+
+SRC_URI = http://pdx.freedesktop.org/~fontconfig/release/fontconfig-2.2.92.tar.gz \
+       file://${FILESDIR}/freetype-includes.patch;patch=1;pnum=0 \
+       file://${FILESDIR}/makefile1.patch;patch=1 \
+       file://${FILESDIR}/makefile2.patch;patch=1 
+
+S = "${WORKDIR}/fontconfig-2.2.92"
+
+inherit autotools libtool pkgconfig
+
+EXTRA_OECONF=" --disable-docs "
+
+do_compile () {
+# XXX 2.2.92 dist missing some files !
+          touch fc-list/fc-list.1
+          touch fc-cache/fc-cache.1
+          oe_runmake -C fc-lang      'CC=${BUILD_CC}' \
+               'CFLAGS=${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' \
+               'CPPFLAGS=${BUILD_CPPFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' \
+               'FREETYPE_CFLAGS=-I${STAGING_INCDIR}/freetype2' 'FREETYPE_LIBS=-lfreetype -lz'
+          oe_runmake -C fc-glyphname 'CC=${BUILD_CC}' \
+               'CFLAGS=${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' \
+               'CPPFLAGS=${BUILD_CPPFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}'
+               'FREETYPE_CFLAGS=-I${STAGING_INCDIR}/freetype2' 'FREETYPE_LIBS=-lfreetype -lz'
+          oe_runmake
+}
+
+
+do_stage () {
+       install -m 755 -D src/.libs/libfontconfig.so.${FC_SONAME} ${STAGING_LIBDIR}/libfontconfig.so.${FC_SONAME}
+       ln -sf ./libfontconfig.so.${FC_SONAME} ${STAGING_LIBDIR}/libfontconfig.so.6
+       ln -sf ./libfontconfig.so.${FC_SONAME} ${STAGING_LIBDIR}/libfontconfig.so
+       install -d ${STAGING_INCDIR}/fontconfig
+       cp -a fontconfig/*.h ${STAGING_INCDIR}/fontconfig/
+}
+

diff --git a/freetype/freetype-native_2.1.7.oe b/freetype/freetype-native_2.1.7.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/freetype/freetype_2.1.7.oe b/freetype/freetype_2.1.7.oe
index 59050f3..7805403 100644 (file)
--- a/freetype/freetype_2.1.7.oe
+++ b/freetype/freetype_2.1.7.oe
@@ -9,7 +9,8 @@ SRC_URI = ftp://ftp.freetype.org/freetype/freetype2/freetype-${PV}.tar.bz2 \
 
 inherit autotools libtool pkgconfig
 
-EXTRA_OEMAKE="'LIBTOOL=${STAGING_BINDIR}/${HOST_SYS}-libtool'"
+LIBTOOL=${S}/builds/unix/${HOST_SYS}-libtool
+EXTRA_OEMAKE="'LIBTOOL=${LIBTOOL}'"
 
 do_configure () {
        cd builds/unix
@@ -26,7 +27,8 @@ do_stage () {
 
        install -m 0644 objs/.libs/libfreetype.lai ${STAGING_LIBDIR}/libfreetype.la
        cp -a include/*.h ${STAGING_INCDIR}
-       cp -a include/freetype ${STAGING_INCDIR}
+       install -d ${STAGING_INCDIR}/freetype2
+       cp -a include/freetype ${STAGING_INCDIR}/freetype2/
 
        sed -e 's,/usr,${STAGING_DIR}/target,' < builds/unix/freetype-config > ${STAGING_BINDIR}/freetype-config
        chmod u+x ${STAGING_BINDIR}/freetype-config