diff options
author | Tim Harder <radhermit@gentoo.org> | 2018-12-28 14:50:18 -0600 |
---|---|---|
committer | Tim Harder <radhermit@gentoo.org> | 2018-12-28 14:52:09 -0600 |
commit | 56a2c31206d814cdce77666e70adcfd0364c1ce0 (patch) | |
tree | f5444b66147f2d4787e0d49eb9725cc8f6fae033 /dev-libs/msgpack/files | |
parent | dev-libs/msgpack: version bump to 3.1.1 (diff) | |
download | gentoo-56a2c31206d814cdce77666e70adcfd0364c1ce0.tar.gz gentoo-56a2c31206d814cdce77666e70adcfd0364c1ce0.tar.bz2 gentoo-56a2c31206d814cdce77666e70adcfd0364c1ce0.zip |
dev-libs/msgpack: remove old
Signed-off-by: Tim Harder <radhermit@gentoo.org>
Diffstat (limited to 'dev-libs/msgpack/files')
-rw-r--r-- | dev-libs/msgpack/files/msgpack-1.4.2-cflags.patch | 32 | ||||
-rw-r--r-- | dev-libs/msgpack/files/msgpack-1.4.2-static.patch | 46 |
2 files changed, 0 insertions, 78 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 deleted file mode 100644 index bb3bc6bcbc5b..000000000000 --- a/dev-libs/msgpack/files/msgpack-1.4.2-cflags.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 deleted file mode 100644 index 994e9fbbc297..000000000000 --- a/dev-libs/msgpack/files/msgpack-1.4.2-static.patch +++ /dev/null @@ -1,46 +0,0 @@ -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}) |