mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-29 14:16:31 +00:00
package/luarocks: fix generated configuration when luajit
this trick removes the need of the patch Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
parent
41278d88e3
commit
f947d52b39
@ -1,34 +0,0 @@
|
|||||||
From fedd1259e47a6f6cb97bce8c9bf31eeb261b93be Mon Sep 17 00:00:00 2001
|
|
||||||
From: Francois Perrad <francois.perrad@gadz.org>
|
|
||||||
Date: Sat, 27 Jul 2019 15:26:26 +0200
|
|
||||||
Subject: [PATCH] allow libluajit detection
|
|
||||||
|
|
||||||
This detection was done only if luarocks is runned by luajit.
|
|
||||||
But on Buildroot, luarocks is always runned by lua.
|
|
||||||
|
|
||||||
See https://github.com/luarocks/luarocks/pull/883
|
|
||||||
|
|
||||||
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
|
|
||||||
---
|
|
||||||
src/luarocks/deps.lua | 4 +---
|
|
||||||
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
|
|
||||||
index cb85764..02cdda6 100644
|
|
||||||
--- a/src/luarocks/deps.lua
|
|
||||||
+++ b/src/luarocks/deps.lua
|
|
||||||
@@ -555,10 +555,8 @@ function deps.check_lua_libdir(vars)
|
|
||||||
"lua-" .. cfg.lua_version,
|
|
||||||
"lua-" .. shortv,
|
|
||||||
"lua",
|
|
||||||
+ "luajit-" .. cfg.lua_version,
|
|
||||||
}
|
|
||||||
- if ljv then
|
|
||||||
- table.insert(libnames, 1, "luajit-" .. cfg.lua_version)
|
|
||||||
- end
|
|
||||||
local cache = {}
|
|
||||||
for _, libname in ipairs(libnames) do
|
|
||||||
local ok = check_external_dependency("LUA", { library = libname }, vars, "build", cache)
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
@ -33,10 +33,17 @@ define HOST_LUAROCKS_CONFIGURE_CMDS
|
|||||||
cd $(@D) && ./configure $(HOST_LUAROCKS_CONF_OPTS)
|
cd $(@D) && ./configure $(HOST_LUAROCKS_CONF_OPTS)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
ifeq ($(BR2_PACKAGE_LUAJIT),y)
|
||||||
|
define LUAROCKS_CONFIGURE_INTERPRETER_LUAJIT
|
||||||
|
echo "lua_interpreter = [[luajit]]" >> $(LUAROCKS_CONFIG_FILE)
|
||||||
|
endef
|
||||||
|
endif
|
||||||
|
|
||||||
define HOST_LUAROCKS_INSTALL_CMDS
|
define HOST_LUAROCKS_INSTALL_CMDS
|
||||||
rm -f $(LUAROCKS_CONFIG_FILE)
|
rm -f $(LUAROCKS_CONFIG_FILE)
|
||||||
$(MAKE1) -C $(@D) install
|
$(MAKE1) -C $(@D) install
|
||||||
cat $(HOST_LUAROCKS_PKGDIR)/luarocks-br-config.lua >> $(LUAROCKS_CONFIG_FILE)
|
cat $(HOST_LUAROCKS_PKGDIR)/luarocks-br-config.lua >> $(LUAROCKS_CONFIG_FILE)
|
||||||
|
$(LUAROCKS_CONFIGURE_INTERPRETER_LUAJIT)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
$(eval $(host-generic-package))
|
$(eval $(host-generic-package))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user