diff options
| author | Wang Mingyu <wangmy@fujitsu.com> | 2023-03-08 09:40:16 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-20 17:20:44 +0000 |
| commit | 6f01d6ba0c97984d623281307d7e5a0b876e4a86 (patch) | |
| tree | 03dcd8a1176ded18eb296e5cc069c092d1e1108f | |
| parent | 747d12561a3d67a6eaa1ea965d2c445b02c49df3 (diff) | |
| download | poky-6f01d6ba0c97984d623281307d7e5a0b876e4a86.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: b2892b3b6fa1d396f845539c0256ca0f71378b94)
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>
(cherry picked from commit b58d86f9902a7eb7a821a3e36ba298c082c0f1f1)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/lua/lua_5.4.4.bb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/recipes-devtools/lua/lua_5.4.4.bb b/meta/recipes-devtools/lua/lua_5.4.4.bb index 0b2e754b31..a39d888ec2 100644 --- a/meta/recipes-devtools/lua/lua_5.4.4.bb +++ b/meta/recipes-devtools/lua/lua_5.4.4.bb | |||
| @@ -57,3 +57,6 @@ do_install_ptest () { | |||
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | BBCLASSEXTEND = "native nativesdk" | 59 | BBCLASSEXTEND = "native nativesdk" |
| 60 | |||
| 61 | inherit multilib_script | ||
| 62 | MULTILIB_SCRIPTS = "${PN}-dev:${includedir}/luaconf.h" | ||