diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-06-02 14:39:22 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-06-21 19:22:26 +0200 |
| commit | 3181aa0eb5b0f49b3c64aa3ef63dad3b771cff75 (patch) | |
| tree | 902165284944ccd5d989dc2d814a4c9eca4622be /meta-oe/recipes-devtools/lua/lua5.1/luaorg_1.patch | |
| parent | a4b54a8cc3855a0ca2585215c3dcb971f0ca59c1 (diff) | |
| download | meta-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_1.patch')
| -rw-r--r-- | meta-oe/recipes-devtools/lua/lua5.1/luaorg_1.patch | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/meta-oe/recipes-devtools/lua/lua5.1/luaorg_1.patch b/meta-oe/recipes-devtools/lua/lua5.1/luaorg_1.patch deleted file mode 100644 index b64a6a26bf..0000000000 --- a/meta-oe/recipes-devtools/lua/lua5.1/luaorg_1.patch +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | lua.org patch 1 for lua-5.1.5. | ||
| 2 | from http://www.lua.org/bugs.html | ||
| 3 | |||
| 4 | Upstream-Status: Backport | ||
| 5 | |||
| 6 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
| 7 | diff -Nurd lua-5.1.5/src/Makefile lua-5.1.5/src/Makefile | ||
| 8 | --- lua-5.1.5/src/Makefile 2012-02-13 22:41:22.000000000 +0200 | ||
| 9 | +++ lua-5.1.5/src/Makefile 2013-10-25 11:29:49.769540434 +0300 | ||
| 10 | @@ -48,7 +48,7 @@ | ||
| 11 | a: $(ALL_A) | ||
| 12 | |||
| 13 | $(LUA_A): $(CORE_O) $(LIB_O) | ||
| 14 | - $(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files | ||
| 15 | + $(AR) $@ $(CORE_O) $(LIB_O) | ||
| 16 | $(RANLIB) $@ | ||
| 17 | |||
| 18 | $(LUA_T): $(LUA_O) $(LUA_A) | ||