@@ -9,7 +9,7 @@ LUVI_SOURCE = luvi-src-v$(LUVI_VERSION).tar.gz
LUVI_SITE = https://github.com/luvit/luvi/releases/download/v$(LUVI_VERSION)
LUVI_LICENSE = Apache-2.0
LUVI_LICENSE_FILES = LICENSE.txt
-LUVI_DEPENDENCIES = libuv luajit luv host-luajit
+LUVI_DEPENDENCIES = libuv luajit luv host-luajit host-pkgconf
# Dispatch all architectures of LuaJIT
ifeq ($(BR2_i386),y)
@@ -30,12 +30,16 @@ else
LUVI_TARGET_ARCH = $(BR2_ARCH)
endif
+# LUAJIT_VERSION and the luajit installation path may not use the
+# same value. Use the value from luajit.pc file.
+LUVI_LUAJIT_VERSION = `$(PKG_CONFIG_HOST_BINARY) --variable=version luajit`
+
# Bundled lua bindings have to be linked statically into the luvi executable
LUVI_CONF_OPTS = \
-DBUILD_SHARED_LIBS=OFF \
-DWithSharedLibluv=ON \
-DTARGET_ARCH=$(LUVI_TARGET_ARCH) \
- -DLUA_PATH=$(HOST_DIR)/share/luajit-$(LUAJIT_VERSION)/?.lua
+ -DLUA_PATH=$(HOST_DIR)/share/luajit-$(LUVI_LUAJIT_VERSION)/?.lua
# Add "rex" module (PCRE via bundled lrexlib)
ifeq ($(BR2_PACKAGE_PCRE),y)
Luajit package has been recently updated to the latest commit in the master branch [1]. Since then LUAJIT_VERSION doesn't contain the luajit version anymore but a commit hash: LUAJIT_VERSION = 05f1984e1a862e4b3d3c3b370c773492e2edf84a Use pkg-config --variable=version luajit in luvi package to set LUA_PATH correctly. Fixes: luajit: unknown luaJIT command or jit.* modules not installed https://gitlab.com/buildroot.org/buildroot/-/jobs/1710552605 [1] 9450b53c8e06f1b5a75840b82c0f4663a5d75c45 Signed-off-by: Romain Naour <romain.naour@gmail.com> Cc: Jörg Krause <joerg.krause@embedded.rocks> --- The TestLuvi doesn't work yet due to missing rng support on Qemu armv7 target used to run the test. luvi -v is stuck due to getrandom(). v2: use build-time shell expansion (Yann) --- package/luvi/luvi.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)