diff options
| author |   Ming Liu <ming.liu@windriver.com> | 2014-04-07 19:27:17 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-08 17:50:21 +0100 |
| commit | e5bae3426856f9d2fdb604278154b6242011d103 (patch) | |
| tree | 88bb42771a7ff6f8819f7f9ba44cf0d69248f184 /meta/recipes-devtools | |
| parent | ff52836e1838590eeec7d7658e15b21d83cf8455 (diff) | |
| download | openembedded-core-contrib-e5bae3426856f9d2fdb604278154b6242011d103.tar.gz | |
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@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs.inc | 3 | ||||
| -rw-r--r-- | 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 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" |