GitHub/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim synced 2025-07-20 12:32:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(build): make vendored libmpack and libmpack-lua build properly

Browse Source
This commit is contained in:
Björn Linse
2021-09-04 17:05:22 +02:00
parent 4ef3c2c2c1
commit 2a08aeff1a
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/mpack/lmpack.c
View File

@ -15,8 +15,6 @@
* compilation. * compilation.
*/ */
#define LUA_LIB #define LUA_LIB
/* for snprintf */
#define _XOPEN_SOURCE 500
#include <limits.h> #include <limits.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -26,12 +24,11 @@
#include <lua.h> #include <lua.h>
#include <luaconf.h> #include <luaconf.h>
#ifdef MPACK_USE_SYSTEM #include "nvim/macros.h"
# include <mpack.h>
#else #include "lmpack.h"
# define MPACK_API static
# include "mpack-src/src/mpack.c" #include "rpc.h"
#endif
#define UNPACKER_META_NAME "mpack.Unpacker" #define UNPACKER_META_NAME "mpack.Unpacker"
#define PACKER_META_NAME "mpack.Packer" #define PACKER_META_NAME "mpack.Packer"
@ -713,7 +710,7 @@ static void lmpack_unparse_enter(mpack_parser_t *parser, mpack_node_t *node)
node->tok = mpack_pack_nil(); node->tok = mpack_pack_nil();
break; break;
} }
/* Fallthrough */ FALLTHROUGH;
default: default:
{ {
/* #define FMT */ /* #define FMT */

3
src/mpack/lmpack.h Normal file
View File

@ -0,0 +1,3 @@
#include <lua.h>
int luaopen_mpack(lua_State *L);

14
src/nvim/CMakeLists.txt
View File

@ -87,8 +87,8 @@ file(MAKE_DIRECTORY ${LINT_SUPPRESSES_ROOT}/src)
file(GLOB NVIM_SOURCES *.c) file(GLOB NVIM_SOURCES *.c)
file(GLOB NVIM_HEADERS *.h) file(GLOB NVIM_HEADERS *.h)
file(GLOB XDIFF_SOURCES ../xdiff/*.c) file(GLOB EXTERNAL_SOURCES ../xdiff/*.c ../mpack/*.c)
file(GLOB XDIFF_HEADERS ../xdiff/*.h) file(GLOB EXTERNAL_HEADERS ../xdiff/*.h ../mpack/*.h)
foreach(subdir foreach(subdir
os os
@ -171,8 +171,8 @@ foreach(sfile ${CONV_SOURCES})
message(FATAL_ERROR "${sfile} doesn't exist (it was added to CONV_SOURCES)") message(FATAL_ERROR "${sfile} doesn't exist (it was added to CONV_SOURCES)")
endif() endif()
endforeach() endforeach()
# xdiff: inlined external project, we don't maintain it. #9306 # xdiff, mpack: inlined external project, we don't maintain it. #9306
list(APPEND CONV_SOURCES ${XDIFF_SOURCES}) list(APPEND CONV_SOURCES ${EXTERNAL_SOURCES})
if(NOT MSVC) if(NOT MSVC)
set_source_files_properties( set_source_files_properties(
@ -471,7 +471,7 @@ endif()
add_executable(nvim ${NVIM_GENERATED_FOR_SOURCES} ${NVIM_GENERATED_FOR_HEADERS} add_executable(nvim ${NVIM_GENERATED_FOR_SOURCES} ${NVIM_GENERATED_FOR_HEADERS}
${NVIM_GENERATED_SOURCES} ${NVIM_SOURCES} ${NVIM_HEADERS} ${NVIM_GENERATED_SOURCES} ${NVIM_SOURCES} ${NVIM_HEADERS}
${XDIFF_SOURCES} ${XDIFF_HEADERS}) ${EXTERNAL_SOURCES} ${EXTERNAL_HEADERS})
target_link_libraries(nvim ${NVIM_EXEC_LINK_LIBRARIES}) target_link_libraries(nvim ${NVIM_EXEC_LINK_LIBRARIES})
install_helper(TARGETS nvim) install_helper(TARGETS nvim)
@ -602,7 +602,7 @@ add_library(
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
${NVIM_SOURCES} ${NVIM_GENERATED_SOURCES} ${NVIM_SOURCES} ${NVIM_GENERATED_SOURCES}
${NVIM_HEADERS} ${NVIM_GENERATED_FOR_SOURCES} ${NVIM_GENERATED_FOR_HEADERS} ${NVIM_HEADERS} ${NVIM_GENERATED_FOR_SOURCES} ${NVIM_GENERATED_FOR_HEADERS}
${XDIFF_SOURCES} ${XDIFF_HEADERS} ${EXTERNAL_SOURCES} ${EXTERNAL_HEADERS}
) )
set_property(TARGET libnvim APPEND PROPERTY set_property(TARGET libnvim APPEND PROPERTY
INCLUDE_DIRECTORIES ${LUA_PREFERRED_INCLUDE_DIRS}) INCLUDE_DIRECTORIES ${LUA_PREFERRED_INCLUDE_DIRS})
@ -632,7 +632,7 @@ else()
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
${NVIM_SOURCES} ${NVIM_GENERATED_SOURCES} ${NVIM_SOURCES} ${NVIM_GENERATED_SOURCES}
${NVIM_HEADERS} ${NVIM_GENERATED_FOR_SOURCES} ${NVIM_GENERATED_FOR_HEADERS} ${NVIM_HEADERS} ${NVIM_GENERATED_FOR_SOURCES} ${NVIM_GENERATED_FOR_HEADERS}
${XDIFF_SOURCES} ${XDIFF_HEADERS} ${EXTERNAL_SOURCES} ${EXTERNAL_HEADERS}
${UNIT_TEST_FIXTURES} ${UNIT_TEST_FIXTURES}
) )
target_link_libraries(nvim-test ${NVIM_TEST_LINK_LIBRARIES}) target_link_libraries(nvim-test ${NVIM_TEST_LINK_LIBRARIES})