aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan S <jan.schreib@gmail.com>2020-02-01 20:19:07 +0100
committerdaurnimator <quae@daurnimator.com>2020-02-02 20:13:31 +1100
commit7c70a3208dcab7a9e568ede2a30b870ce0d96a20 (patch)
tree8690423c55b151d814acfc387327c77df37593a0
parentcf26233de5d21cac1893390c2f1a1791e574f79a (diff)
downloadluarocks-7c70a3208dcab7a9e568ede2a30b870ce0d96a20.tar.gz
luarocks-7c70a3208dcab7a9e568ede2a30b870ce0d96a20.tar.bz2
luarocks-7c70a3208dcab7a9e568ede2a30b870ce0d96a20.zip
Add OpenBSD specific dependency paths.
This commit enables luarocks to be configured and build on OpenBSD.
-rwxr-xr-xconfigure1
-rw-r--r--src/luarocks/deps.lua1
2 files changed, 2 insertions, 0 deletions
diff --git a/configure b/configure
index 5deb44be..89c9ce64 100755
--- a/configure
+++ b/configure
@@ -433,6 +433,7 @@ check_incdir() {
433 for lua_h in \ 433 for lua_h in \
434 "$incdir/lua/$LUA_VERSION/lua.h" \ 434 "$incdir/lua/$LUA_VERSION/lua.h" \
435 "$incdir/lua$LUA_VERSION/lua.h" \ 435 "$incdir/lua$LUA_VERSION/lua.h" \
436 "$incdir/lua-$LUA_VERSION/lua.h" \
436 "$incdir/lua$(echo "$LUA_VERSION" | tr -d .)/lua.h" \ 437 "$incdir/lua$(echo "$LUA_VERSION" | tr -d .)/lua.h" \
437 "$incdir/lua.h" \ 438 "$incdir/lua.h" \
438 $("$LUA_BINDIR/$LUA_INTERPRETER" -e 'print(jit and [['"$incdir"'/luajit-]]..jit.version:match("(%d+%.%d+)")..[[/lua.h]] or "")') 439 $("$LUA_BINDIR/$LUA_INTERPRETER" -e 'print(jit and [['"$incdir"'/luajit-]]..jit.version:match("(%d+%.%d+)")..[[/lua.h]] or "")')
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index b72661b7..0eb80193 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -655,6 +655,7 @@ local function find_lua_incdir(prefix, luaver, luajitver)
655 local incdirs = { 655 local incdirs = {
656 prefix .. "/include/lua/" .. luaver, 656 prefix .. "/include/lua/" .. luaver,
657 prefix .. "/include/lua" .. luaver, 657 prefix .. "/include/lua" .. luaver,
658 prefix .. "/include/lua-" .. luaver,
658 prefix .. "/include/lua" .. shortv, 659 prefix .. "/include/lua" .. shortv,
659 prefix .. "/include", 660 prefix .. "/include",
660 prefix, 661 prefix,