diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2012-09-29 19:19:15 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-02 11:40:49 +0100 |
| commit | fc3b6656afdabfa50bcbd4028cc3d2a9881c551f (patch) | |
| tree | c96a7a5902e18f5cb85e538e043b292c2fa1ebf3 /meta/recipes-devtools/rpm/rpm | |
| parent | 6b76d9e764ddabf0a82d355bfeea02b402f0785b (diff) | |
| download | ast2050-yocto-poky-fc3b6656afdabfa50bcbd4028cc3d2a9881c551f.zip ast2050-yocto-poky-fc3b6656afdabfa50bcbd4028cc3d2a9881c551f.tar.gz | |
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 <morgan.little@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm')
| -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 0000000..0e45ed7 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch @@ -0,0 +1,35 @@ +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. + +Signed-off-by: Morgan Little <morgan.little@windriver.com> + + +--- a/lua/local/luuid.c.orig ++++ b/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) + +--- a/rpmio/rpmuuid.c.orig ++++ b/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" + |
