From 590446f6b191b32efc462c3cb7ac7cce4c897b05 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Mon, 7 Apr 2014 19:27:18 +0800 Subject: freetype: fix multilib header conflict - ftconfig.h ftconfig.h conflicts between 32-bit and 64-bit versions. Signed-off-by: Ming Liu Signed-off-by: Richard Purdie --- meta/recipes-graphics/freetype/freetype_2.5.2.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'meta/recipes-graphics/freetype') diff --git a/meta/recipes-graphics/freetype/freetype_2.5.2.bb b/meta/recipes-graphics/freetype/freetype_2.5.2.bb index b93453ae59..0c62a678cd 100644 --- a/meta/recipes-graphics/freetype/freetype_2.5.2.bb +++ b/meta/recipes-graphics/freetype/freetype_2.5.2.bb @@ -21,7 +21,7 @@ SRC_URI[sha256sum] = "4ff4bd393aa01071ec7b849d035508a505a78f88b2bcf25ff11e58e43c S = "${WORKDIR}/freetype-${PV}" -inherit autotools-brokensep pkgconfig binconfig +inherit autotools-brokensep pkgconfig binconfig multilib_header LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" @@ -50,5 +50,9 @@ do_compile_prepend() { ${BUILD_CC} -o objs/apinames src/tools/apinames.c } +do_install_append() { + oe_multilib_header freetype2/config/ftconfig.h +} + BBCLASSEXTEND = "native" -- cgit 1.2.3-korg