summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathy Vanvoorden <mathy@vanvoorden.be>2017-02-26 00:53:40 +0100
committerPatrice Clement <monsieurp@gentoo.org>2017-08-23 19:05:54 +0200
commita6c7811d79b3c02dee4950097f080da5195a1e10 (patch)
treef0e51adb48bfc9ee241020546c492321dcc4b5d8 /dev-libs/msgpack/files
parentdev-cpp/waylandpp: ebuild cleanup (diff)
downloadgentoo-a6c7811d79b3c02dee4950097f080da5195a1e10.tar.gz
gentoo-a6c7811d79b3c02dee4950097f080da5195a1e10.tar.bz2
gentoo-a6c7811d79b3c02dee4950097f080da5195a1e10.zip
dev-libs/msgpack: version bump to 1.4.2 and 2.2.1
An update to the latest version of 1.X and 2.X of the package. This was already being worked on in PR #2974, I processed the comments and added some extra things: * Updated copyright. * EAPI version bump. * Updated license to Boost-1.0. * Added examples USE-flag. * Added doc USE-flag. * Updated patches for cflags and static-libs. * Masked for testing. The new versions are masked for testing as the status of depending packages is currently unknown. Bugs for the package maintainers will be created. Gentoo-Bug: https://bugs.gentoo.org/601370 Closes: https://github.com/gentoo/gentoo/pull/4078 Package-Manager: Portage-2.3.6, Repoman-2.3.1
Diffstat (limited to 'dev-libs/msgpack/files')
-rw-r--r--dev-libs/msgpack/files/msgpack-1.4.2-cflags.patch32
-rw-r--r--dev-libs/msgpack/files/msgpack-1.4.2-static.patch46
2 files changed, 78 insertions, 0 deletions
diff --git a/dev-libs/msgpack/files/msgpack-1.4.2-cflags.patch b/dev-libs/msgpack/files/msgpack-1.4.2-cflags.patch
new file mode 100644
index 000000000000..bb3bc6bcbc5b
--- /dev/null
+++ b/dev-libs/msgpack/files/msgpack-1.4.2-cflags.patch
@@ -0,0 +1,32 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7a9b241..73fe07c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -283,13 +283,6 @@ IF (MSGPACK_BUILD_TESTS)
+ ADD_SUBDIRECTORY (test)
+ ENDIF ()
+
+-IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+- IF (MSGPACK_ENABLE_SHARED)
+- SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3 -DPIC")
+- ENDIF ()
+- SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3" )
+-ENDIF ()
+-
+ IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+ SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
+ ENDIF ()
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 5dfbbe4..5d1cb8a 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -74,9 +74,6 @@ FOREACH (source_file ${check_PROGRAMS})
+ ${CMAKE_THREAD_LIBS_INIT}
+ )
+ ADD_TEST (${source_file_we} ${source_file_we})
+- IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+- SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3 ")
+- ENDIF ()
+ IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+ SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
+ ENDIF ()
diff --git a/dev-libs/msgpack/files/msgpack-1.4.2-static.patch b/dev-libs/msgpack/files/msgpack-1.4.2-static.patch
new file mode 100644
index 000000000000..994e9fbbc297
--- /dev/null
+++ b/dev-libs/msgpack/files/msgpack-1.4.2-static.patch
@@ -0,0 +1,46 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7a9b241..49b0405 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,6 +20,7 @@ SET (GNUCXX_NO_MISMATCHED_TAGS_SUPPORT_VERSION "4.4")
+ OPTION (MSGPACK_CXX11 "Using c++11 compiler" OFF)
+ OPTION (MSGPACK_32BIT "32bit compile" OFF)
+ OPTION (MSGPACK_BOOST "Using boost libraries" OFF)
++OPTION (MSGPACK_STATIC "Build static library" ON)
+
+ SET (CMAKE_CXX_FLAGS "-DMSGPACK_DISABLE_LEGACY_NIL ${CMAKE_CXX_FLAGS}")
+ SET (CMAKE_CXX_FLAGS "-DMSGPACK_DISABLE_LEGACY_CONVERT ${CMAKE_CXX_FLAGS}")
+@@ -263,12 +264,14 @@ IF (MSGPACK_ENABLE_SHARED)
+ )
+ ENDIF ()
+
+-ADD_LIBRARY (msgpackc-static STATIC
+- ${msgpackc_SOURCES}
+- ${msgpackc_HEADERS}
+-)
++IF (MSGPACK_STATIC)
++ ADD_LIBRARY (msgpackc-static STATIC
++ ${msgpackc_SOURCES}
++ ${msgpackc_HEADERS}
++ )
++ SET_TARGET_PROPERTIES (msgpackc-static PROPERTIES OUTPUT_NAME "msgpackc")
++ENDIF()
+
+-SET_TARGET_PROPERTIES (msgpackc-static PROPERTIES OUTPUT_NAME "msgpackc")
+ IF (MSGPACK_ENABLE_SHARED)
+ SET_TARGET_PROPERTIES (msgpackc PROPERTIES IMPORT_SUFFIX "_import.lib")
+ SET_TARGET_PROPERTIES (msgpackc PROPERTIES SOVERSION 2 VERSION 2.0.0)
+@@ -322,9 +325,10 @@ IF (MSGPACK_BUILD_EXAMPLES)
+ ENDIF ()
+
+ IF (MSGPACK_ENABLE_SHARED)
+- SET (MSGPACK_INSTALLTARGETS msgpackc msgpackc-static)
+-ELSE()
+- SET (MSGPACK_INSTALLTARGETS msgpackc-static)
++ SET (MSGPACK_INSTALLTARGETS msgpackc)
++ENDIF()
++IF (MSGPACK_STATIC)
++ SET (MSGPACK_INSTALLTARGETS ${MSGPACK_INSTALLTARGETS} msgpackc-static)
+ ENDIF ()
+
+ INSTALL (TARGETS ${MSGPACK_INSTALLTARGETS} DESTINATION ${CMAKE_INSTALL_LIBDIR})