diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch | 35 |
1 files changed, 35 insertions, 0 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 @@ | |||
1 | A patch to fix a problem when compiling with uuid. | ||
2 | |||
3 | When attempting to build with uuid and all tests compiling will error because | ||
4 | uuid.h doesn't exist in the rpm tarball. Fix this by changing the include to | ||
5 | use the one in ossp which solves the issue. | ||
6 | |||
7 | The recipe already depends on ossp so ossp/uuid.h will be there when rpm-native | ||
8 | is built. | ||
9 | |||
10 | Signed-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 | |||