From 2af0e6c86555450a1238a7e5ff7e5c2a2c8b47ef Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Sep 2023 16:50:17 +0200 Subject: [PATCH] package/luvi: fix build pkg-config --variable=version luajit returns 2.1.1693350652 since bump of luajit in commit c9dcd9e459d6e0a955129ab42916d4c1140bdc3d, but the directory is still host/share/luajit-2.1 - resulting in the following build failure: luajitluajit:: unknown luaJIT command or jit.* modules not installedunknown luaJIT command or jit.* modules not installed Fixes: - http://autobuild.buildroot.org/results/d1cac93407122bb5a6e2c13f49b542e1db619fb5 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/luvi/luvi.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/luvi/luvi.mk b/package/luvi/luvi.mk index 4a8072dee5..a8e645fab3 100644 --- a/package/luvi/luvi.mk +++ b/package/luvi/luvi.mk @@ -32,14 +32,15 @@ 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` +LUVI_LUAJIT_MAJVER = `$(PKG_CONFIG_HOST_BINARY) --variable=majver luajit` +LUVI_LUAJIT_MINVER = `$(PKG_CONFIG_HOST_BINARY) --variable=minver 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-$(LUVI_LUAJIT_VERSION)/?.lua + -DLUA_PATH=$(HOST_DIR)/share/luajit-$(LUVI_LUAJIT_MAJVER).$(LUVI_LUAJIT_MINVER)/?.lua # Add "rex" module (PCRE via bundled lrexlib) ifeq ($(BR2_PACKAGE_PCRE),y)