mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-25 20:07:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: USE_BUNDLED_LUV=0 with USE_BUNDLED_LUAROCKS=1 #10291

Browse Source 
Fixes https://github.com/neovim/neovim/issues/10289
This commit is contained in:
Daniel Hahler
2019-06-22 03:43:31 +02:00
committed by Justin M. Keyes
parent aa090f9801
commit 058a8ed6ec
1 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
third-party/cmake/BuildLuarocks.cmake vendored
View File

@@ -181,30 +181,36 @@ if(USE_BUNDLED_BUSTED)
DEPENDS busted) DEPENDS busted)
add_custom_target(luacheck add_custom_target(luacheck
DEPENDS ${LUACHECK_EXE}) DEPENDS ${LUACHECK_EXE})
set(nvim_client_depends luacheck)
set(LUV_DEPS luacheck luv-static lua-compat-5.3) if(USE_BUNDLED_LUV)
if(MINGW AND CMAKE_CROSSCOMPILING) set(LUV_DEPS luacheck luv-static lua-compat-5.3)
set(LUV_DEPS ${LUV_DEPS} libuv_host) if(MINGW AND CMAKE_CROSSCOMPILING)
set(LUV_DEPS ${LUV_DEPS} libuv_host)
endif()
set(LUV_ARGS "CFLAGS=-O0 -g3 -fPIC")
if(USE_BUNDLED_LIBUV)
list(APPEND LUV_ARGS LIBUV_DIR=${HOSTDEPS_INSTALL_DIR})
endif()
# DEPENDS on the previous module, because Luarocks breaks if parallel.
SET(LUV_PRIVATE_ARGS LUA_COMPAT53_INCDIR=${DEPS_BUILD_DIR}/src/lua-compat-5.3)
add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/luv
COMMAND ${LUAROCKS_BINARY}
ARGS make ${LUAROCKS_BUILDARGS} ${LUV_ARGS} ${LUV_PRIVATE_ARGS}
WORKING_DIRECTORY ${DEPS_BUILD_DIR}/src/luv
DEPENDS ${LUV_DEPS})
add_custom_target(luv
DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/luv)
set(nvim_client_depends luv)
else()
set(nvim_client_depends luacheck)
endif() endif()
set(LUV_ARGS "CFLAGS=-O0 -g3 -fPIC")
if(USE_BUNDLED_LIBUV)
list(APPEND LUV_ARGS LIBUV_DIR=${HOSTDEPS_INSTALL_DIR})
endif()
# DEPENDS on the previous module, because Luarocks breaks if parallel.
SET(LUV_PRIVATE_ARGS LUA_COMPAT53_INCDIR=${DEPS_BUILD_DIR}/src/lua-compat-5.3)
add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/luv
COMMAND ${LUAROCKS_BINARY}
ARGS make ${LUAROCKS_BUILDARGS} ${LUV_ARGS} ${LUV_PRIVATE_ARGS}
WORKING_DIRECTORY ${DEPS_BUILD_DIR}/src/luv
DEPENDS ${LUV_DEPS})
add_custom_target(luv
DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/luv)
# DEPENDS on the previous module, because Luarocks breaks if parallel. # DEPENDS on the previous module, because Luarocks breaks if parallel.
add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/nvim-client add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/nvim-client
COMMAND ${LUAROCKS_BINARY} COMMAND ${LUAROCKS_BINARY}
ARGS build nvim-client 0.2.0-1 ${LUAROCKS_BUILDARGS} ARGS build nvim-client 0.2.0-1 ${LUAROCKS_BUILDARGS}
DEPENDS luv) DEPENDS ${nvim_client_depends})
add_custom_target(nvim-client add_custom_target(nvim-client
DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/nvim-client) DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/nvim-client)