aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch
blob: 713f84ee27b1f1254dec0463a9875f16ba1afcc9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
A patch to fix a problem when compiling with uuid.

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.

Upstream-Status: Pending

Signed-off-by: Morgan Little <morgan.little@windriver.com>


Index: rpm-5.4.14/lua/local/luuid.c
===================================================================
--- rpm-5.4.14.orig/lua/local/luuid.c
+++ rpm-5.4.14/lua/local/luuid.c
@@ -21,7 +21,7 @@
 
 #ifdef LUA_USE_UUID
 
-#include "uuid.h"
+#include <ossp/uuid.h>
 
 /*  Lua method: <uuid> = uuid.generate(<version>[, <uuid-namespace>, <data>])  */
 static int luuid_generate(lua_State *L)
Index: rpm-5.4.14/rpmio/rpmuuid.c
===================================================================
--- rpm-5.4.14.orig/rpmio/rpmuuid.c
+++ rpm-5.4.14/rpmio/rpmuuid.c
@@ -16,7 +16,7 @@
 #include "rpmlog.h"
 #include "rpmuuid.h"
 #ifdef WITH_UUID
-#include "uuid.h"
+#include <ossp/uuid.h>
 #endif
 #include "debug.h"