summaryrefslogtreecommitdiffstats
path: root/package/luarocks/0001-allow-libluajit-detection.patch
diff options
context:
space:
mode:
authorPeter Korsgaard <peter@korsgaard.com>2018-09-07 13:08:31 +0200
committerPeter Korsgaard <peter@korsgaard.com>2018-09-07 13:13:17 +0200
commit721e4cbb529d247c9c1ebef68275e70a3086ae0b (patch)
tree2967ef4e10e2592661f664df4515d67dbc80cfe5 /package/luarocks/0001-allow-libluajit-detection.patch
parent89920e9735cb561dccf1e1f81d35788fd10a655b (diff)
parentcec266ee1f708f11cc679cb4f81613fa4186003c (diff)
downloadbuildroot-721e4cbb529d247c9c1ebef68275e70a3086ae0b.tar.gz
buildroot-721e4cbb529d247c9c1ebef68275e70a3086ae0b.zip
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/luarocks/0001-allow-libluajit-detection.patch')
-rw-r--r--package/luarocks/0001-allow-libluajit-detection.patch4
1 files changed, 3 insertions, 1 deletions
diff --git a/package/luarocks/0001-allow-libluajit-detection.patch b/package/luarocks/0001-allow-libluajit-detection.patch
index c5e52f4281..05d025bba2 100644
--- a/package/luarocks/0001-allow-libluajit-detection.patch
+++ b/package/luarocks/0001-allow-libluajit-detection.patch
@@ -6,6 +6,8 @@ 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 +---
@@ -15,7 +17,7 @@ diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index 8403f12..c1c0220 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
-@@ -511,10 +511,8 @@ function deps.check_lua(vars)
+@@ -513,10 +513,8 @@ function deps.check_lua(vars)
"lua-" .. cfg.lua_version,
"lua-" .. shortv,
"lua",
OpenPOWER on IntegriCloud