msgpack-c: update to 2.0.0
Additional changes: * removes all patches imported into upstream
This commit is contained in:
@@ -1,26 +0,0 @@
|
||||
diff --git a/test/msgpack_basic.cpp b/test/msgpack_basic.cpp
|
||||
index 15215b2..4cc1e92 100644
|
||||
--- a/test/msgpack_basic.cpp
|
||||
+++ b/test/msgpack_basic.cpp
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
-#if defined(_MSC_VER)
|
||||
+#if defined(_WIN32)
|
||||
#define msgpack_rand() ((double)rand() / RAND_MAX)
|
||||
#else // _MSC_VER
|
||||
#define msgpack_rand() drand48()
|
||||
diff --git a/test/msgpack_c.cpp b/test/msgpack_c.cpp
|
||||
index 3ce5e2b..71d5b22 100644
|
||||
--- a/test/msgpack_c.cpp
|
||||
+++ b/test/msgpack_c.cpp
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
-#if defined(_MSC_VER)
|
||||
+#if defined(_WIN32)
|
||||
#define msgpack_rand() ((double)rand() / RAND_MAX)
|
||||
#else // _MSC_VER
|
||||
#define msgpack_rand() drand48()
|
||||
@@ -1,26 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 7a9b241..d3a44bc 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -313,6 +313,10 @@ IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC90" OR "${CMAKE_CXX_COMPILER_ID}" S
|
||||
SET_SOURCE_FILES_PROPERTIES(${msgpackc_SOURCES} PROPERTIES LANGUAGE CXX)
|
||||
ENDIF()
|
||||
|
||||
+IF (NOT DEFINED CMAKE_INSTALL_BINDIR)
|
||||
+ SET(CMAKE_INSTALL_BINDIR bin)
|
||||
+ENDIF ()
|
||||
+
|
||||
IF (NOT DEFINED CMAKE_INSTALL_LIBDIR)
|
||||
SET(CMAKE_INSTALL_LIBDIR lib)
|
||||
ENDIF ()
|
||||
@@ -327,7 +331,9 @@ ELSE()
|
||||
SET (MSGPACK_INSTALLTARGETS msgpackc-static)
|
||||
ENDIF ()
|
||||
|
||||
-INSTALL (TARGETS ${MSGPACK_INSTALLTARGETS} DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
+INSTALL (TARGETS ${MSGPACK_INSTALLTARGETS} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
INSTALL (DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
|
||||
IF (NOT MSVC)
|
||||
INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
|
||||
@@ -1,17 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 7a9b241..d568e43 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -270,7 +270,11 @@ ADD_LIBRARY (msgpackc-static STATIC
|
||||
|
||||
SET_TARGET_PROPERTIES (msgpackc-static PROPERTIES OUTPUT_NAME "msgpackc")
|
||||
IF (MSGPACK_ENABLE_SHARED)
|
||||
- SET_TARGET_PROPERTIES (msgpackc PROPERTIES IMPORT_SUFFIX "_import.lib")
|
||||
+ IF (MINGW)
|
||||
+ SET_TARGET_PROPERTIES (msgpackc PROPERTIES IMPORT_SUFFIX ".dll.a")
|
||||
+ ELSE ()
|
||||
+ SET_TARGET_PROPERTIES (msgpackc PROPERTIES IMPORT_SUFFIX "_import.lib")
|
||||
+ ENDIF ()
|
||||
SET_TARGET_PROPERTIES (msgpackc PROPERTIES SOVERSION 2 VERSION 2.0.0)
|
||||
ENDIF ()
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
_realname=msgpack-c
|
||||
pkgbase="mingw-w64-${_realname}"
|
||||
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
|
||||
pkgver=1.4.2
|
||||
pkgver=2.0.0
|
||||
pkgrel=1
|
||||
pkgdesc="MessagePack implementation for C and C++ (mingw-w64)"
|
||||
arch=('any')
|
||||
@@ -13,21 +13,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gtest"
|
||||
"${MINGW_PACKAGE_PREFIX}-cmake"
|
||||
"${MINGW_PACKAGE_PREFIX}-zlib")
|
||||
depends=()
|
||||
source=("https://github.com/msgpack/msgpack-c/releases/download/cpp-$pkgver/msgpack-${pkgver}.tar.gz"
|
||||
"0010-detect-mingw.patch"
|
||||
"0020-runtime-output-directory.patch"
|
||||
"0030-fix-suffix.patch")
|
||||
sha256sums=('c0f1da8462ea44b23f89573eff04a1f329bcff6fd80eb0d4b976d7f19caf1fa2'
|
||||
'14306459c014f18349bc5196ceea099cfd063329575c34efe5c2c5909b6d867e'
|
||||
'0ed894637e254c09966c8ccd6d1ec7ad79c2ca713c9f1cdc91b0e94efa21c72b'
|
||||
'70e43cce1e6bac50209634708a35f64bad46ddc271d89fd80626c2202e73f069')
|
||||
|
||||
prepare() {
|
||||
cd "msgpack-${pkgver}"
|
||||
patch -p1 -i "${srcdir}/0010-detect-mingw.patch"
|
||||
patch -p1 -i "${srcdir}/0020-runtime-output-directory.patch"
|
||||
patch -p1 -i "${srcdir}/0030-fix-suffix.patch"
|
||||
}
|
||||
source=("https://github.com/msgpack/msgpack-c/releases/download/cpp-$pkgver/msgpack-${pkgver}.tar.gz")
|
||||
sha256sums=('41de0989a3385061ab7307a1005655e780def6fc9c89af0ec942616aa787e136')
|
||||
|
||||
build() {
|
||||
[ -d "${srcdir}/build-${MINGW_CHOST}" ] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
|
||||
|
||||
Reference in New Issue
Block a user