[oe-commits] Ming Liu : freetype: fix multilib header conflict - ftconfig.h

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 4f9149aa4da24f4e1466639893257669554e8889
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=4f9149aa4da24f4e1466639893257669554e8889

Author: Ming Liu <ming.liu at windriver.com>
Date:   Mon Apr  7 19:27:18 2014 +0800

freetype: fix multilib header conflict - ftconfig.h

ftconfig.h conflicts between 32-bit and 64-bit versions.

Signed-off-by: Ming Liu <ming.liu at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-graphics/freetype/freetype_2.5.2.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/freetype/freetype_2.5.2.bb b/meta/recipes-graphics/freetype/freetype_2.5.2.bb
index b93453a..0c62a67 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"