summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-devtools/lua/lua5.1/luaorg_2.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-06-02 14:39:22 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2014-06-21 19:22:26 +0200
commit3181aa0eb5b0f49b3c64aa3ef63dad3b771cff75 (patch)
tree902165284944ccd5d989dc2d814a4c9eca4622be /meta-oe/recipes-devtools/lua/lua5.1/luaorg_2.patch
parenta4b54a8cc3855a0ca2585215c3dcb971f0ca59c1 (diff)
downloadmeta-openembedded-3181aa0eb5b0f49b3c64aa3ef63dad3b771cff75.tar.gz
lua: Remove lua5.1
* we have lua-5.2 in "lua" recipe and lua-5.1 in "lua5.1", but these aren't completely separate in sysroot: WARNING: The recipe lua is trying to install files into a shared area when those files already exist. Those files and their manifest location are: /OE/build/oe-core/tmp-eglibc/sysroots/qemux86/usr/include/lauxlib.h Matched in manifest-qemux86-lua5.1.populate_sysroot /OE/build/oe-core/tmp-eglibc/sysroots/qemux86/usr/include/lua.h Matched in manifest-qemux86-lua5.1.populate_sysroot /OE/build/oe-core/tmp-eglibc/sysroots/qemux86/usr/include/lua.hpp Matched in manifest-qemux86-lua5.1.populate_sysroot /OE/build/oe-core/tmp-eglibc/sysroots/qemux86/usr/include/luaconf.h Matched in manifest-qemux86-lua5.1.populate_sysroot /OE/build/oe-core/tmp-eglibc/sysroots/qemux86/usr/include/lualib.h Matched in manifest-qemux86-lua5.1.populate_sysroot /OE/build/oe-core/tmp-eglibc/sysroots/qemux86/usr/lib/liblua.a Matched in manifest-qemux86-lua5.1.populate_sysroot Please verify which package should provide the above files. Causing some undeterministic behavior. * keep only 5.2 in "lua" Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/lua/lua5.1/luaorg_2.patch')
-rw-r--r--meta-oe/recipes-devtools/lua/lua5.1/luaorg_2.patch44
1 files changed, 0 insertions, 44 deletions
diff --git a/meta-oe/recipes-devtools/lua/lua5.1/luaorg_2.patch b/meta-oe/recipes-devtools/lua/lua5.1/luaorg_2.patch
deleted file mode 100644
index 0c48ea2876..0000000000
--- a/meta-oe/recipes-devtools/lua/lua5.1/luaorg_2.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1lua.org patch 2 for lua-5.1.5.
2from http://www.lua.org/bugs.html
3
4Upstream-Status: Backport
5
6Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
7diff -Nurd lua-5.1.5/src/lzio.c lua-5.1.5/src/lzio.c
8--- lua-5.1.5/src/lzio.c 2007-12-27 15:02:25.000000000 +0200
9+++ lua-5.1.5/src/lzio.c 2013-10-25 11:32:45.773536572 +0300
10@@ -22,10 +22,14 @@
11 size_t size;
12 lua_State *L = z->L;
13 const char *buff;
14+ if (z->eoz) return EOZ;
15 lua_unlock(L);
16 buff = z->reader(L, z->data, &size);
17 lua_lock(L);
18- if (buff == NULL || size == 0) return EOZ;
19+ if (buff == NULL || size == 0) {
20+ z->eoz = 1; /* avoid calling reader function next time */
21+ return EOZ;
22+ }
23 z->n = size - 1;
24 z->p = buff;
25 return char2int(*(z->p++));
26@@ -51,6 +55,7 @@
27 z->data = data;
28 z->n = 0;
29 z->p = NULL;
30+ z->eoz = 0;
31 }
32
33
34diff -Nurd lua-5.1.5/src/lzio.h lua-5.1.5/src/lzio.h
35--- lua-5.1.5/src/lzio.h 2007-12-27 15:02:25.000000000 +0200
36+++ lua-5.1.5/src/lzio.h 2013-10-25 11:31:50.301537789 +0300
37@@ -59,6 +59,7 @@
38 lua_Reader reader;
39 void* data; /* additional data */
40 lua_State *L; /* Lua state (for reader) */
41+ int eoz; /* true if reader has no more data */
42 };
43
44