From fc3b6656afdabfa50bcbd4028cc3d2a9881c551f Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Sat, 29 Sep 2012 19:19:15 -0500 Subject: 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 Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-devtools/rpm/rpm_5.4.9.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/recipes-devtools/rpm/rpm_5.4.9.bb') 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" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native" -PR = "r48" +PR = "r49" # rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed # 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 file://rpmatch.patch \ file://fstack-protector-configure-check.patch \ file://dbconvert.patch \ + file://rpm-uuid-include.patch \ " SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768" -- cgit v1.2.3-54-g00ecf