diff options
| author | Ming Liu <ming.liu@windriver.com> | 2014-04-07 19:27:18 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-08 17:50:21 +0100 |
| commit | 590446f6b191b32efc462c3cb7ac7cce4c897b05 (patch) | |
| tree | f7f74da66422464c6f447fc83b413395b15cd969 | |
| parent | e5bae3426856f9d2fdb604278154b6242011d103 (diff) | |
| download | openembedded-core-590446f6b191b32efc462c3cb7ac7cce4c897b05.tar.gz openembedded-core-590446f6b191b32efc462c3cb7ac7cce4c897b05.tar.bz2 openembedded-core-590446f6b191b32efc462c3cb7ac7cce4c897b05.zip | |
freetype: fix multilib header conflict - ftconfig.h
ftconfig.h conflicts between 32-bit and 64-bit versions.
Signed-off-by: Ming Liu <ming.liu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-graphics/freetype/freetype_2.5.2.bb | 6 |
1 files changed, 5 insertions, 1 deletions
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" |