From e5bae3426856f9d2fdb604278154b6242011d103 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Mon, 7 Apr 2014 19:27:17 +0800 Subject: e2fsprogs: fix multilib header conflict - ext2_types.h ext2_types.h conflicts between 32-bit and 64-bit versions. Signed-off-by: Ming Liu Signed-off-by: Richard Purdie --- meta/recipes-devtools/e2fsprogs/e2fsprogs.inc | 3 +-- meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/recipes-devtools/e2fsprogs') diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc index a34df378da..99447c1540 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc @@ -22,5 +22,4 @@ DEPENDS = "util-linux" SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \ file://mkdir.patch" -inherit autotools gettext pkgconfig - +inherit autotools gettext pkgconfig multilib_header diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb index 3a5d6ee33d..2bdd7246a2 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb @@ -52,6 +52,8 @@ do_install () { mv ${D}${base_libdir}/e2initrd_helper ${D}${libdir} mv ${D}${base_libdir}/pkgconfig ${D}${libdir} fi + + oe_multilib_header ext2fs/ext2_types.h } RDEPENDS_e2fsprogs = "e2fsprogs-badblocks" -- cgit 1.2.3-korg