Commit Graph

5 Commits (master)

Author SHA1 Message Date
Josef Schlehofer 2a98220abc luajit: conflict with luajit2
luajit and luajit2 both install /usr/lib/libluajit-5.1.so and
/usr/lib/libluajit-5.1.so.2. luajit2 provides luajit, so apk never
installs both, but Kconfig lets both be selected, and the image then
silently gets only luajit2.

Declare the conflict on luajit. dnsdist, knot-resolver and snort3
depend on luajit, and Kconfig selects it for them depending on luajit2,
so a conflict on luajit2 creates a Kconfig dependency cycle.

Checked with defconfig: luajit drops to m when luajit2 or
nginx-mod-lua-resty-lrucache is selected.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2026-10-31 06:12:52 +01:00
Josef Schlehofer 72e727c51a luajit: do not build on riscv64
LuaJIT 2.1.0-beta3 does not support riscv64 and fails there with
"No support for this architecture (yet)". HAS_LUAJIT_ARCH, which
luajit and luajit2 share, includes riscv64 since luajit2 got riscv64
support, so luajit is built on riscv64 and fails.

Exclude riscv64 from luajit. luajit2 provides luajit, so on riscv64
dnsdist and snort3 use luajit2.

Checked with defconfig on sifiveu: dnsdist and snort3 no longer select
luajit, CONFIG_ALL builds them with luajit2, armsr/armv8 is unchanged.

Fixes: 47525f3300 ("luajit2: add riscv64 support")
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2026-10-30 06:37:21 +01:00
Josef Schlehofer 0839415eb5 luajit: indent the package metadata with two spaces
The Package/luajit block is indented with one space, but the formality
check wants two spaces for added lines. Indent the whole block with two
spaces, so the next change does not mix both.

The generated package metadata is unchanged.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2026-10-30 06:37:21 +01:00
Josef Schlehofer 47525f3300 luajit2: add riscv64 support
This adds support RISC-V64 to luajit2 by backporting
https://redirect.github.com/openresty/luajit2/pull/236

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2025-12-29 12:46:10 +01:00
Alexandru Ardelean 7eebedcdfc lua: move Lua packages under lang/lua sub-folder
There are roughly 50 Lua packages.
It's about time we consider a proposal for moving all of them
under a lang/lua sub-folder.

Signed-off-by: Alexandru Ardelean <alex@shruggie.ro>
2025-11-17 08:46:33 +02:00