| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 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 | Upstream-Status: Pending |
| 11 | |
| 12 | Signed-off-by: Morgan Little <morgan.little@windriver.com> |
| 13 | |
| 14 | |
| 15 | Index: rpm-5.4.14/lua/local/luuid.c |
| 16 | =================================================================== |
| 17 | --- rpm-5.4.14.orig/lua/local/luuid.c |
| 18 | +++ rpm-5.4.14/lua/local/luuid.c |
| 19 | @@ -21,7 +21,7 @@ |
| 20 | |
| 21 | #ifdef LUA_USE_UUID |
| 22 | |
| 23 | -#include "uuid.h" |
| 24 | +#include <ossp/uuid.h> |
| 25 | |
| 26 | /* Lua method: <uuid> = uuid.generate(<version>[, <uuid-namespace>, <data>]) */ |
| 27 | static int luuid_generate(lua_State *L) |
| 28 | Index: rpm-5.4.14/rpmio/rpmuuid.c |
| 29 | =================================================================== |
| 30 | --- rpm-5.4.14.orig/rpmio/rpmuuid.c |
| 31 | +++ rpm-5.4.14/rpmio/rpmuuid.c |
| 32 | @@ -16,7 +16,7 @@ |
| 33 | #include "rpmlog.h" |
| 34 | #include "rpmuuid.h" |
| 35 | #ifdef WITH_UUID |
| 36 | -#include "uuid.h" |
| 37 | +#include <ossp/uuid.h> |
| 38 | #endif |
| 39 | #include "debug.h" |
| 40 | |