Pārlūkot izejas kodu

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 <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Fabrice Fontaine 1 gadu atpakaļ
vecāks
revīzija
2af0e6c865
1 mainītis faili ar 3 papildinājumiem un 2 dzēšanām
  1. 3 2
      package/luvi/luvi.mk

+ 3 - 2
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)