summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm/rpm_5.4.9.bb
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-09-29 19:19:15 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-02 11:40:49 +0100
commitfc3b6656afdabfa50bcbd4028cc3d2a9881c551f (patch)
treec96a7a5902e18f5cb85e538e043b292c2fa1ebf3 /meta/recipes-devtools/rpm/rpm_5.4.9.bb
parent6b76d9e764ddabf0a82d355bfeea02b402f0785b (diff)
downloadpoky-fc3b6656afdabfa50bcbd4028cc3d2a9881c551f.tar.gz
rpm-native: Fix 'uuid_rc_t' undeclared error when compiling
When attempting to build with uuid and all tests compiling will error because uuid.h doesn't exist in the rpm tarball. Fix this by changing the include to use the one in ossp which solves the issue. The recipe already depends on ossp so ossp/uuid.h will be there when rpm-native is built. (From OE-Core rev: 52ae2c2439bcb78323f61a3666e9b630b3a40b15) Signed-off-by: Morgan Little <morgan.little@windriver.com> Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm_5.4.9.bb')
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.9.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
index 54354457b6..2a4c8d831c 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
@@ -43,7 +43,7 @@ LICENSE = "LGPLv2.1"
43LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" 43LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
44 44
45DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native" 45DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native"
46PR = "r48" 46PR = "r49"
47 47
48# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed 48# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
49# in order to extract the distribution SRPM into a format we can extract... 49# in order to extract the distribution SRPM into a format we can extract...
@@ -76,6 +76,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.9-0.20120508.src.rpm;ex
76 file://rpmatch.patch \ 76 file://rpmatch.patch \
77 file://fstack-protector-configure-check.patch \ 77 file://fstack-protector-configure-check.patch \
78 file://dbconvert.patch \ 78 file://dbconvert.patch \
79 file://rpm-uuid-include.patch \
79 " 80 "
80 81
81SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768" 82SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768"