From b0f5441c5eb2e3f4a3b847c48583e43425cd97e2 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Mon, 30 Sep 2019 12:50:22 +0200
Subject: bundle: upgrade LuaJIT to latest v2.1 (#10321)

---
 third-party/cmake/BuildLuarocks.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'third-party/cmake/BuildLuarocks.cmake')

diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake
index 87e2946c96..7551c52ecc 100644
--- a/third-party/cmake/BuildLuarocks.cmake
+++ b/third-party/cmake/BuildLuarocks.cmake
@@ -57,7 +57,7 @@ if(UNIX OR (MINGW AND CMAKE_CROSSCOMPILING))
   if(USE_BUNDLED_LUAJIT)
     list(APPEND LUAROCKS_OPTS
       --with-lua=${HOSTDEPS_INSTALL_DIR}
-      --with-lua-include=${HOSTDEPS_INSTALL_DIR}/include/luajit-2.0
+      --with-lua-include=${HOSTDEPS_INSTALL_DIR}/include/luajit-2.1
       --lua-suffix=jit)
   elseif(USE_BUNDLED_LUA)
     list(APPEND LUAROCKS_OPTS
@@ -89,7 +89,7 @@ elseif(MSVC OR MINGW)
     /LUA ${DEPS_INSTALL_DIR}
     /LIB ${DEPS_LIB_DIR}
     /BIN ${DEPS_BIN_DIR}
-    /INC ${DEPS_INSTALL_DIR}/include/luajit-2.0
+    /INC ${DEPS_INSTALL_DIR}/include/luajit-2.1
     /P ${DEPS_INSTALL_DIR}/luarocks /TREE ${DEPS_INSTALL_DIR}
     /SCRIPTS ${DEPS_BIN_DIR}
     /CMOD ${DEPS_BIN_DIR}
-- 
cgit 


From 629ea19994d832a7de806e451941dd4904bcc5ed Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Tue, 19 Nov 2019 19:10:30 +0100
Subject: deps: upgrade bundled LuaRocks: 2.4.4 => 3.2.1 (#10292)

Changelog: https://github.com/luarocks/luarocks/compare/v2.4.4..v3.2.1#diff-4ac32a78649ca5bdd8e0ba38b7006a1e
---
 third-party/cmake/BuildLuarocks.cmake | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

(limited to 'third-party/cmake/BuildLuarocks.cmake')

diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake
index 7551c52ecc..4b1b94a46b 100644
--- a/third-party/cmake/BuildLuarocks.cmake
+++ b/third-party/cmake/BuildLuarocks.cmake
@@ -52,13 +52,17 @@ if(NOT MSVC)
   set(LUAROCKS_BUILDARGS CC=${HOSTDEPS_C_COMPILER} LD=${HOSTDEPS_C_COMPILER})
 endif()
 
+# Lua version, used with rocks directories.
+# Defaults to 5.1 for bundled LuaJIT/Lua.
+set(LUA_VERSION "5.1")
+
 if(UNIX OR (MINGW AND CMAKE_CROSSCOMPILING))
 
   if(USE_BUNDLED_LUAJIT)
     list(APPEND LUAROCKS_OPTS
       --with-lua=${HOSTDEPS_INSTALL_DIR}
       --with-lua-include=${HOSTDEPS_INSTALL_DIR}/include/luajit-2.1
-      --lua-suffix=jit)
+      --with-lua-interpreter=luajit)
   elseif(USE_BUNDLED_LUA)
     list(APPEND LUAROCKS_OPTS
       --with-lua=${HOSTDEPS_INSTALL_DIR})
@@ -66,9 +70,23 @@ if(UNIX OR (MINGW AND CMAKE_CROSSCOMPILING))
     find_package(LuaJit)
     if(LUAJIT_FOUND)
       list(APPEND LUAROCKS_OPTS
-        --lua-version=5.1
         --with-lua-include=${LUAJIT_INCLUDE_DIRS}
-        --lua-suffix=jit)
+        --with-lua-interpreter=luajit)
+    endif()
+
+    # Get LUA_VERSION used with rocks output.
+    if(LUAJIT_FOUND)
+      set(LUA_EXE "luajit")
+    else()
+      set(LUA_EXE "lua")
+    endif()
+    execute_process(
+      COMMAND ${LUA_EXE} -e "print(string.sub(_VERSION, 5))"
+      OUTPUT_VARIABLE LUA_VERSION
+      ERROR_VARIABLE ERR
+      RESULT_VARIABLE RES)
+    if(NOT RES EQUAL 0)
+      message(FATAL_ERROR "Could not get LUA_VERSION with ${LUA_EXE}: ${ERR}")
     endif()
   endif()
 
@@ -111,7 +129,7 @@ if(USE_BUNDLED_LUAJIT)
 elseif(USE_BUNDLED_LUA)
   add_dependencies(luarocks lua)
 endif()
-set(ROCKS_DIR ${HOSTDEPS_LIB_DIR}/luarocks/rocks)
+set(ROCKS_DIR ${HOSTDEPS_LIB_DIR}/luarocks/rocks-${LUA_VERSION})
 
 # mpack
 add_custom_command(OUTPUT ${ROCKS_DIR}/mpack
-- 
cgit