mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/luvi: fix build

Browse Source 
pkg-config --variable=version luajit returns 2.1.1693350652 since bump of
luajit in commit c9dcd9e459, 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 <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine
2023-09-24 16:50:17 +02:00
committed by Peter Korsgaard
parent 380cf4279d
commit 2af0e6c865
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
package/luvi/luvi.mk
View File

@@ -32,14 +32,15 @@ endif
# LUAJIT_VERSION and the luajit installation path may not use the # LUAJIT_VERSION and the luajit installation path may not use the
# same value. Use the value from luajit.pc file. # 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 # Bundled lua bindings have to be linked statically into the luvi executable
LUVI_CONF_OPTS = \ LUVI_CONF_OPTS = \
-DBUILD_SHARED_LIBS=OFF \ -DBUILD_SHARED_LIBS=OFF \
-DWithSharedLibluv=ON \ -DWithSharedLibluv=ON \
-DTARGET_ARCH=$(LUVI_TARGET_ARCH) \ -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) # Add "rex" module (PCRE via bundled lrexlib)
ifeq ($(BR2_PACKAGE_PCRE),y) ifeq ($(BR2_PACKAGE_PCRE),y)