diff options
| author | Dongxiao Xu <dongxiao.xu@intel.com> | 2011-07-13 16:44:52 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-20 15:24:55 +0100 |
| commit | 99e1b18de5de1fb8558222cef2fc9aac27a797a6 (patch) | |
| tree | c88b543c0c39225d2b2eab11c2da6705ca1ef907 | |
| parent | ec7ea43749d40e4164dc35493a796b9546e60e4e (diff) | |
| download | openembedded-core-99e1b18de5de1fb8558222cef2fc9aac27a797a6.tar.gz openembedded-core-99e1b18de5de1fb8558222cef2fc9aac27a797a6.tar.bz2 openembedded-core-99e1b18de5de1fb8558222cef2fc9aac27a797a6.tar.xz openembedded-core-99e1b18de5de1fb8558222cef2fc9aac27a797a6.zip | |
pciutils: Change the hardcoded /usr/lib to support multilib.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
| -rw-r--r-- | meta/recipes-bsp/pciutils/pciutils-3.1.7/makefile.patch | 14 | ||||
| -rw-r--r-- | meta/recipes-bsp/pciutils/pciutils_3.1.7.bb | 5 |
2 files changed, 17 insertions, 2 deletions
diff --git a/meta/recipes-bsp/pciutils/pciutils-3.1.7/makefile.patch b/meta/recipes-bsp/pciutils/pciutils-3.1.7/makefile.patch new file mode 100644 index 000000000..811aac8e1 --- /dev/null +++ b/meta/recipes-bsp/pciutils/pciutils-3.1.7/makefile.patch @@ -0,0 +1,14 @@ +Upstream-Status: Inappropriate [configuration] + +diff -ruN pciutils-3.1.7-orig/Makefile pciutils-3.1.7/Makefile +--- pciutils-3.1.7-orig/Makefile 2011-07-11 14:41:59.000000000 +0800 ++++ pciutils-3.1.7/Makefile 2011-07-11 14:42:31.000000000 +0800 +@@ -31,7 +31,7 @@ + IDSDIR=$(SHAREDIR) + MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi) + INCDIR=$(PREFIX)/include +-LIBDIR=$(PREFIX)/lib ++LIBDIR=$(libdir) + PKGCFDIR=$(LIBDIR)/pkgconfig + + # Commands diff --git a/meta/recipes-bsp/pciutils/pciutils_3.1.7.bb b/meta/recipes-bsp/pciutils/pciutils_3.1.7.bb index 4e6d4e101..b48aaf02c 100644 --- a/meta/recipes-bsp/pciutils/pciutils_3.1.7.bb +++ b/meta/recipes-bsp/pciutils/pciutils_3.1.7.bb @@ -9,13 +9,14 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "zlib" RDEPENDS_${PN} = "${PN}-ids" -PR = "r1" +PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.bz2 \ file://configure.patch \ file://pcimodules-pciutils.diff \ file://lib-build-fix.patch \ - file://guess-fix.patch" + file://guess-fix.patch \ + file://makefile.patch" SRC_URI[md5sum] = "35222edb86b50a6641352c66fe829b2e" SRC_URI[sha256sum] = "d8fe23b6966c1abf29b3b38b08b0cf33f731cd6e6a89d9b8d2b8d5e982c3f544" |