Fix freetype recipe to build ft2demos again

[AGL/meta-agl.git] / meta-ivi-common / recipes-test / freetype / freetype_%.bbappend

diff --git a/meta-ivi-common/recipes-test/freetype/freetype_%.bbappend b/meta-ivi-common/recipes-test/freetype/freetype_%.bbappend
index e195dd1..926e0d8 100644 (file)
--- a/meta-ivi-common/recipes-test/freetype/freetype_%.bbappend
+++ b/meta-ivi-common/recipes-test/freetype/freetype_%.bbappend
@@ -2,24 +2,28 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 SRC_URI =+ "${SOURCEFORGE_MIRROR}/freetype/ft2demos-${PV}.tar.bz2;name=ft2demos \
            file://0001-Makefile-dont-build-gfx-demos.patch;patchdir=../ft2demos-${PV} \
+           file://0001-ft2demos-Makefile-Do-not-hardcode-libtool-path.patch;patchdir=../ft2demos-${PV} \
           "
 SRC_URI[ft2demos.md5sum] = "f7c6102f29834a80456264fe4edd81d1"
 SRC_URI[ft2demos.sha256sum] = "b076ac52465e912d035f111ede78b88bf3dd186f91a56a54ff83ffdf862e84e4"
 
 PACKAGES =+ "${PN}-demos"
 
+B = "${S}"
+
 do_compile_append () {
-       oe_runmake -C ${WORKDIR}/ft2demos-${PV} TOP_DIR=${WORKDIR}/${BPN}-${PV}
+
+       oe_runmake -C ${WORKDIR}/ft2demos-${PV} TOP_DIR=${WORKDIR}/${BPN}-${PV}/
 }
 
-do_install_append_checkforkrogoth () {
+do_install_append () {
        install -d -m 0755 ${D}/${bindir}
        for x in ftbench ftdump ftlint ftvalid ttdebug; do 
-               install -m 0755 ${WORKDIR}/ft2demos-${PV}/bin/$x ${D}/${bindir}
+               install -m 0755 ${WORKDIR}/ft2demos-${PV}/bin/.libs/$x ${D}/${bindir}
        done
 }
 
-FILES_${PN}-demos_checkforkrogoth = "\
+FILES_${PN}-demos = "\
    ${bindir}/ftbench \
    ${bindir}/ftdump \
    ${bindir}/ftlint \