|
@@ -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)
|