neovim: add patch for msgpack-1.4.0 compat.
This commit is contained in:
parent
51ca7b40d0
commit
a235b255f5
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
@ -0,0 +1,49 @@
|
|||
commit feb70192a85d04343ecc383ea9a42aa8cd15e98d
|
||||
Author: James McCoy <jamessan@jamessan.com>
|
||||
Date: Fri Jan 22 14:37:19 2016 -0500
|
||||
|
||||
cmake: Search for both libmsgpackc and libmsgpack #4075
|
||||
|
||||
libmsgpack was the old C++ library provided by msgpack-c. The C library
|
||||
is libmsgpackc.
|
||||
|
||||
The C++ support became header-only, but there was a bug
|
||||
(msgpack/msgpack-c#395) wherein using msgpack-c's CMake build system
|
||||
would only install libmsgpack instead of libmsgpackc.
|
||||
|
||||
Searching for both libraries, but preferring libmsgpackc, allows for
|
||||
building against older msgpack-c releases and prepares for the upcoming
|
||||
msgpack-c release which fixes the aforementioned issues.
|
||||
|
||||
Signed-off-by: James McCoy <jamessan@jamessan.com>
|
||||
|
||||
diff --git a/cmake/FindMsgpack.cmake b/cmake/FindMsgpack.cmake
|
||||
index 7d88137..fbd107e 100644
|
||||
--- ./cmake/FindMsgpack.cmake
|
||||
+++ ./cmake/FindMsgpack.cmake
|
||||
@@ -7,7 +7,7 @@
|
||||
if(NOT MSGPACK_USE_BUNDLED)
|
||||
find_package(PkgConfig)
|
||||
if (PKG_CONFIG_FOUND)
|
||||
- pkg_check_modules(PC_MSGPACK QUIET msgpack)
|
||||
+ pkg_search_module(PC_MSGPACK QUIET msgpackc msgpack)
|
||||
endif()
|
||||
else()
|
||||
set(PC_MSGPACK_INCLUDEDIR)
|
||||
@@ -23,13 +23,14 @@ find_path(MSGPACK_INCLUDE_DIR msgpack.h
|
||||
HINTS ${PC_MSGPACK_INCLUDEDIR} ${PC_MSGPACK_INCLUDE_DIRS}
|
||||
${LIMIT_SEARCH})
|
||||
|
||||
-# If we're asked to use static linkage, add libmsgpack.a as a preferred library name.
|
||||
+# If we're asked to use static linkage, add libmsgpack{,c}.a as a preferred library name.
|
||||
if(MSGPACK_USE_STATIC)
|
||||
list(APPEND MSGPACK_NAMES
|
||||
+ "${CMAKE_STATIC_LIBRARY_PREFIX}msgpackc${CMAKE_STATIC_LIBRARY_SUFFIX}"
|
||||
"${CMAKE_STATIC_LIBRARY_PREFIX}msgpack${CMAKE_STATIC_LIBRARY_SUFFIX}")
|
||||
endif()
|
||||
|
||||
-list(APPEND MSGPACK_NAMES msgpack)
|
||||
+list(APPEND MSGPACK_NAMES msgpackc msgpack)
|
||||
|
||||
find_library(MSGPACK_LIBRARY NAMES ${MSGPACK_NAMES}
|
||||
HINTS ${PC_MSGPACK_LIBDIR} ${PC_MSGPACK_LIBRARY_DIRS}
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'neovim'
|
||||
pkgname=neovim
|
||||
version=0.1.1
|
||||
revision=2
|
||||
revision=3
|
||||
build_style=cmake
|
||||
configure_args="-DLUA_PRG=/usr/bin/lua5.2"
|
||||
hostmakedepends="cmake lua52-lpeg lua52-MessagePack lua52-BitOp"
|
||||
|
|
Loading…
Reference in New Issue