[oe-commits] Ming Liu : e2fsprogs: fix multilib header conflict - ext2_types.h

[git at git.openembedded.org]

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

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

e2fsprogs: fix multilib header conflict - ext2_types.h

ext2_types.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-devtools/e2fsprogs/e2fsprogs.inc       | 3 +--
 meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
index a34df37..99447c1 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 3a5d6ee..2bdd724 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"