summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/rpm')
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch35
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.9.bb3
2 files changed, 37 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch b/meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch
new file mode 100644
index 0000000000..0e45ed78ff
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch
@@ -0,0 +1,35 @@
1A patch to fix a problem when compiling with uuid.
2
3When attempting to build with uuid and all tests compiling will error because
4uuid.h doesn't exist in the rpm tarball. Fix this by changing the include to
5use the one in ossp which solves the issue.
6
7The recipe already depends on ossp so ossp/uuid.h will be there when rpm-native
8is built.
9
10Signed-off-by: Morgan Little <morgan.little@windriver.com>
11
12
13--- a/lua/local/luuid.c.orig
14+++ b/lua/local/luuid.c
15@@ -21,7 +21,7 @@
16
17 #ifdef LUA_USE_UUID
18
19-#include "uuid.h"
20+#include <ossp/uuid.h>
21
22 /* Lua method: <uuid> = uuid.generate(<version>[, <uuid-namespace>, <data>]) */
23 static int luuid_generate(lua_State *L)
24
25--- a/rpmio/rpmuuid.c.orig
26+++ b/rpmio/rpmuuid.c
27@@ -16,7 +16,7 @@
28 #include "rpmlog.h"
29 #include "rpmuuid.h"
30 #ifdef WITH_UUID
31-#include "uuid.h"
32+#include <ossp/uuid.h>
33 #endif
34 #include "debug.h"
35
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"