diff options
| author | Jan Viljanen <jan.viljanen@greenpeace.org> | 2017-02-05 12:07:14 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-05-31 23:13:47 +0200 |
| commit | c1026ff4b3b6500c06d5a2233214addbb41936cb (patch) | |
| tree | 294883cfec4cac3110af08de96029f3d12b05ade | |
| parent | fcc9d999670c6fb29ac01e9c8d0a7e787ccfabea (diff) | |
| download | rneovim-c1026ff4b3b6500c06d5a2233214addbb41936cb.tar.gz rneovim-c1026ff4b3b6500c06d5a2233214addbb41936cb.tar.bz2 rneovim-c1026ff4b3b6500c06d5a2233214addbb41936cb.zip | |
build: LuaRocks 2.4.2 #6059
LuaRocks 2.3 and onwards changed the /P option to no longer include the
version number which made newer releases of LuaRocks fail when compiling
on Windows.
| -rw-r--r-- | third-party/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | third-party/cmake/BuildLuarocks.cmake | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index b8dad75b24..db580ecc9d 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -99,8 +99,9 @@ set(LUAJIT_SHA256 620fa4eb12375021bef6e4f237cbd2dd5d49e56beb414bee052c746beef180 set(LUA_URL https://www.lua.org/ftp/lua-5.1.5.tar.gz) set(LUA_SHA256 2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333) -set(LUAROCKS_URL https://github.com/keplerproject/luarocks/archive/5d8a16526573b36d5b22aa74866120c998466697.tar.gz) -set(LUAROCKS_SHA256 cae709111c5701235770047dfd7169f66b82ae1c7b9b79207f9df0afb722bfd9) +# NOTE: Version must match LUAROCKS_VERSION in third-party/cmake/BuildLuarocks.cmake +set(LUAROCKS_URL https://github.com/luarocks/luarocks/archive/v2.4.2.tar.gz) +set(LUAROCKS_SHA256 eef88c2429c715a7beb921e4b1ba571dddb7c74a250fbb0d3cc0d4be7a5865d9) set(UNIBILIUM_URL https://github.com/mauke/unibilium/archive/v1.2.0.tar.gz) set(UNIBILIUM_SHA256 623af1099515e673abfd3cae5f2fa808a09ca55dda1c65a7b5c9424eb304ead8) diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake index 88ddaf44ce..ef8a8450f1 100644 --- a/third-party/cmake/BuildLuarocks.cmake +++ b/third-party/cmake/BuildLuarocks.cmake @@ -41,6 +41,9 @@ endfunction() # The luarocks binary location set(LUAROCKS_BINARY ${HOSTDEPS_BIN_DIR}/luarocks) +# NOTE: Version must match version of LuaRocks in third-party/CMakeLists.txt +set(LUAROCKS_VERSION 2.4) + # Arguments for calls to 'luarocks build' if(NOT MSVC) # In MSVC don't pass the compiler/linker to luarocks, the bundled @@ -73,13 +76,13 @@ elseif(MSVC OR MINGW) /LIB ${DEPS_LIB_DIR} /BIN ${DEPS_BIN_DIR} /INC ${DEPS_INSTALL_DIR}/include/luajit-2.0/ - /P ${DEPS_INSTALL_DIR} /TREE ${DEPS_INSTALL_DIR} + /P ${DEPS_INSTALL_DIR}/${LUAROCKS_VERSION} /TREE ${DEPS_INSTALL_DIR} /SCRIPTS ${DEPS_BIN_DIR} /CMOD ${DEPS_BIN_DIR} ${MINGW_FLAG} /LUAMOD ${DEPS_BIN_DIR}/lua) - set(LUAROCKS_BINARY ${DEPS_INSTALL_DIR}/2.2/luarocks.bat) + set(LUAROCKS_BINARY ${DEPS_INSTALL_DIR}/${LUAROCKS_VERSION}/luarocks.bat) else() message(FATAL_ERROR "Trying to build luarocks in an unsupported system ${CMAKE_SYSTEM_NAME}/${CMAKE_C_COMPILER_ID}") endif() |