summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMing Liu <ming.liu@windriver.com>2014-10-30 10:59:18 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-04 10:20:33 +0000
commit21fb6bc1b030cab14e2c9b14607b34a62262ac06 (patch)
treeb43db6651495c4c2e610195ac285bab324ba246c
parentc51caffe5ac0d49844dcbac7967f609d44c20470 (diff)
downloadopenembedded-core-contrib-21fb6bc1b030cab14e2c9b14607b34a62262ac06.tar.gz
openembedded-core-contrib-21fb6bc1b030cab14e2c9b14607b34a62262ac06.tar.bz2
openembedded-core-contrib-21fb6bc1b030cab14e2c9b14607b34a62262ac06.zip
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@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-bsp/pciutils/pciutils_3.2.1.bb4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/recipes-bsp/pciutils/pciutils_3.2.1.bb b/meta/recipes-bsp/pciutils/pciutils_3.2.1.bb
index 852a93e1b1..6e29953210 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"