diff options
Diffstat (limited to 'dev-libs/msgpack/files')
-rw-r--r-- | dev-libs/msgpack/files/msgpack-1.0.0-cflags.patch | 25 | ||||
-rw-r--r-- | dev-libs/msgpack/files/msgpack-1.0.0-static.patch | 40 | ||||
-rw-r--r-- | dev-libs/msgpack/files/msgpack-1.1.0-gcc6.patch | 22 |
3 files changed, 0 insertions, 87 deletions
diff --git a/dev-libs/msgpack/files/msgpack-1.0.0-cflags.patch b/dev-libs/msgpack/files/msgpack-1.0.0-cflags.patch deleted file mode 100644 index fc6cacd0a03c..000000000000 --- a/dev-libs/msgpack/files/msgpack-1.0.0-cflags.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- msgpack-1.0.0/CMakeLists.txt -+++ msgpack-1.0.0/CMakeLists.txt -@@ -213,10 +213,6 @@ - ADD_SUBDIRECTORY (test) - ENDIF () - --IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") -- SET_PROPERTY (TARGET msgpack APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -g -O3 -DPIC") -- SET_PROPERTY (TARGET msgpack-static APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -g -O3" ) --ENDIF () - IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") - IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]") - STRING(REGEX REPLACE "/W[0-4]" "/W3" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") ---- msgpack-1.0.0/test/CMakeLists.txt -+++ msgpack-1.0.0/test/CMakeLists.txt -@@ -52,9 +52,6 @@ - ${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 -g -O3") -- ENDIF () - IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") - IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]") - STRING(REGEX REPLACE "/W[0-4]" "/W3" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") diff --git a/dev-libs/msgpack/files/msgpack-1.0.0-static.patch b/dev-libs/msgpack/files/msgpack-1.0.0-static.patch deleted file mode 100644 index e40a9deaaece..000000000000 --- a/dev-libs/msgpack/files/msgpack-1.0.0-static.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- msgpack-1.0.0/CMakeLists.txt -+++ msgpack-1.0.0/CMakeLists.txt -@@ -17,6 +17,7 @@ - - OPTION (MSGPACK_CXX11 "Using c++11 compiler" OFF) - OPTION (MSGPACK_32BIT "32bit compile" OFF) -+OPTION (MSGPACK_STATIC "Build static library" ON) - - IF (MSGPACK_CXX11) - IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") -@@ -196,12 +197,15 @@ - ${msgpack_HEADERS} - ) - --ADD_LIBRARY (msgpack-static STATIC -- ${msgpack_SOURCES} -- ${msgpack_HEADERS} --) -+IF (MSGPACK_STATIC) -+ ADD_LIBRARY (msgpack-static STATIC -+ ${msgpack_SOURCES} -+ ${msgpack_HEADERS} -+ ) -+ SET_TARGET_PROPERTIES (msgpack-static PROPERTIES OUTPUT_NAME "msgpack") -+ INSTALL (TARGETS msgpack-static DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ENDIF () - --SET_TARGET_PROPERTIES (msgpack-static PROPERTIES OUTPUT_NAME "msgpack") - SET_TARGET_PROPERTIES (msgpack PROPERTIES IMPORT_SUFFIX "_import.lib") - SET_TARGET_PROPERTIES (msgpack PROPERTIES SOVERSION 3 VERSION 4.0.0) - -@@ -233,7 +237,7 @@ - SET(CMAKE_INSTALL_LIBDIR lib) - ENDIF () - --INSTALL (TARGETS msgpack msgpack-static DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+INSTALL (TARGETS msgpack DESTINATION ${CMAKE_INSTALL_LIBDIR}) - INSTALL (DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX}) - INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - diff --git a/dev-libs/msgpack/files/msgpack-1.1.0-gcc6.patch b/dev-libs/msgpack/files/msgpack-1.1.0-gcc6.patch deleted file mode 100644 index 2fc9bb46e4bf..000000000000 --- a/dev-libs/msgpack/files/msgpack-1.1.0-gcc6.patch +++ /dev/null @@ -1,22 +0,0 @@ -Bug: https://bugs.gentoo.org/623492 -Backported from: https://github.com/msgpack/msgpack-c/commit/66a5fcf8f1a9e57b02904a6ac55a86a9c74ea1de - ---- a/include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp -+++ b/include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp -@@ -46,13 +46,14 @@ - public: - using base = std::tuple<Types...>; - -- using base::base; - -- tuple() = default; - tuple(tuple const&) = default; - tuple(tuple&&) = default; - - template<typename... OtherTypes> -+ tuple(OtherTypes&&... other):base(std::forward<OtherTypes>(other)...) {} -+ -+ template<typename... OtherTypes> - tuple(tuple<OtherTypes...> const& other):base(static_cast<std::tuple<OtherTypes...> const&>(other)) {} - template<typename... OtherTypes> - tuple(tuple<OtherTypes...> && other):base(static_cast<std::tuple<OtherTypes...> &&>(other)) {} |