diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-12-30 18:38:51 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-13 09:43:21 +0000 |
commit | d0365f35303db3595688a6e5290677e02a72c54e (patch) | |
tree | 41a7989277ed93b4d48c7d331de742fa177fcda9 /meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch | |
parent | 2358e786ec8d1199d90e181eb5d8d00816f669b4 (diff) | |
download | openembedded-core-contrib-d0365f35303db3595688a6e5290677e02a72c54e.tar.gz |
rpm: remove 5.x recipe
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch b/meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch deleted file mode 100644 index 713f84ee27..0000000000 --- a/meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch +++ /dev/null @@ -1,40 +0,0 @@ -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" - |