[oe-commits] Ming Liu : pciutils: Fix multilib header conflict - pci/config.h

[git at git.openembedded.org]

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

Author: Ming Liu <ming.liu at windriver.com>
Date:   Thu Oct 30 10:59:18 2014 +0800

pciutils: Fix multilib header conflict - pci/config.h

pci/config.h conflicts between 32-bit and 64-bit versions.

Signed-off-by: Ming Liu <ming.liu at windriver.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/recipes-bsp/pciutils/pciutils_3.2.1.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/recipes-bsp/pciutils/pciutils_3.2.1.bb b/meta/recipes-bsp/pciutils/pciutils_3.2.1.bb
index 852a93e..6e29953 100644
--- a/meta/recipes-bsp/pciutils/pciutils_3.2.1.bb
+++ b/meta/recipes-bsp/pciutils/pciutils_3.2.1.bb
@@ -17,6 +17,8 @@ SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.bz2 \
 SRC_URI[md5sum] = "425b1acad6854cc2bbb06ac8e48e76fc"
 SRC_URI[sha256sum] = "12d52b19042e2fd058af12e7d877bbbce72213cb3a0b5ec7ff0703ac09e3dcde"
 
+inherit multilib_header
+
 PARALLEL_MAKE = ""
 
 PCI_CONF_FLAG = "ZLIB=yes DNS=yes SHARED=yes"
@@ -49,6 +51,8 @@ do_install () {
 
 	install -d ${D}${bindir}
 	ln -s ../sbin/lspci ${D}${bindir}/lspci
+
+	oe_multilib_header pci/config.h
 }
 
 PACKAGES =+ "${PN}-ids libpci libpci-dev libpci-dbg"