summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-07-13 08:44:52 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-20 14:27:32 (GMT)
commit9fa68e8aea366ded1ebffbacefc4c8d8019fd857 (patch)
treef5b8a5358dde42fb23efac2ebfe4b6a35f29d121 /meta/recipes-bsp
parent16e29ba77ddcf0320cd9ce552650bd69761d0bf0 (diff)
downloadpoky-9fa68e8aea366ded1ebffbacefc4c8d8019fd857.tar.gz
pciutils: Change the hardcoded /usr/lib to support multilib.
(From OE-Core rev: 99e1b18de5de1fb8558222cef2fc9aac27a797a6) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r--meta/recipes-bsp/pciutils/pciutils-3.1.7/makefile.patch14
-rw-r--r--meta/recipes-bsp/pciutils/pciutils_3.1.7.bb5
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 0000000..811aac8
--- /dev/null
+++ b/meta/recipes-bsp/pciutils/pciutils-3.1.7/makefile.patch
@@ -0,0 +1,14 @@
1Upstream-Status: Inappropriate [configuration]
2
3diff -ruN pciutils-3.1.7-orig/Makefile pciutils-3.1.7/Makefile
4--- pciutils-3.1.7-orig/Makefile 2011-07-11 14:41:59.000000000 +0800
5+++ pciutils-3.1.7/Makefile 2011-07-11 14:42:31.000000000 +0800
6@@ -31,7 +31,7 @@
7 IDSDIR=$(SHAREDIR)
8 MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi)
9 INCDIR=$(PREFIX)/include
10-LIBDIR=$(PREFIX)/lib
11+LIBDIR=$(libdir)
12 PKGCFDIR=$(LIBDIR)/pkgconfig
13
14 # Commands
diff --git a/meta/recipes-bsp/pciutils/pciutils_3.1.7.bb b/meta/recipes-bsp/pciutils/pciutils_3.1.7.bb
index 4e6d4e1..b48aaf0 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+"
9LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 9LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
10DEPENDS = "zlib" 10DEPENDS = "zlib"
11RDEPENDS_${PN} = "${PN}-ids" 11RDEPENDS_${PN} = "${PN}-ids"
12PR = "r1" 12PR = "r2"
13 13
14SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.bz2 \ 14SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.bz2 \
15 file://configure.patch \ 15 file://configure.patch \
16 file://pcimodules-pciutils.diff \ 16 file://pcimodules-pciutils.diff \
17 file://lib-build-fix.patch \ 17 file://lib-build-fix.patch \
18 file://guess-fix.patch" 18 file://guess-fix.patch \
19 file://makefile.patch"
19 20
20SRC_URI[md5sum] = "35222edb86b50a6641352c66fe829b2e" 21SRC_URI[md5sum] = "35222edb86b50a6641352c66fe829b2e"
21SRC_URI[sha256sum] = "d8fe23b6966c1abf29b3b38b08b0cf33f731cd6e6a89d9b8d2b8d5e982c3f544" 22SRC_URI[sha256sum] = "d8fe23b6966c1abf29b3b38b08b0cf33f731cd6e6a89d9b8d2b8d5e982c3f544"