diff options
author | Wang Mingyu <wangmy@fujitsu.com> | 2023-03-08 09:40:16 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-08 16:41:55 +0000 |
commit | 59972136638c6348c793458981711c8d5f96f8ae (patch) | |
tree | 0c18b393ad37727c1ad069c325486b1eace846b9 /meta/recipes-core/glibc | |
parent | 76628b2961fb50b4cd88f1c8a10441e06f3583f3 (diff) | |
download | poky-59972136638c6348c793458981711c8d5f96f8ae.tar.gz |
lua: Fix install conflict when enable multilib.
Error: Transaction test error:
file /usr/include/luaconf.h conflicts between attempted installs of lua-dev-5.4.4-r0.aarch64 and lib32-lua-dev-5.4.4-r0.armv7ahf_neon
The differences between the two files are as follows:
@@ -219,7 +219,7 @@
#define LUA_ROOT "/usr/"
#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/"
-#define LUA_CDIR LUA_ROOT "lib64/lua/" LUA_VDIR "/"
+#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/"
#if !defined(LUA_PATH_DEFAULT)
#define LUA_PATH_DEFAULT \
(From OE-Core rev: b58d86f9902a7eb7a821a3e36ba298c082c0f1f1)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glibc')
0 files changed, 0 insertions, 0 deletions