radhermit 15/03/21 06:14:48
Added: msgpack-1.0.0-cflags.patch
msgpack-1.0.0-static.patch
Log:
Version bump.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
4AB3E85B4F064CA3)
Revision Changes Path
1.1 dev-libs/msgpack/files/msgpack-1.0.0-cflags.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/msgpack/files/msgpack-1.0.0-cflags.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/msgpack/files/msgpack-1.0.0-cflags.patch?rev=1.1&content-type=text/plain
Index: msgpack-1.0.0-cflags.patch
===================================================================
--- 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}")
1.1 dev-libs/msgpack/files/msgpack-1.0.0-static.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/msgpack/files/msgpack-1.0.0-static.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/msgpack/files/msgpack-1.0.0-static.patch?rev=1.1&content-type=text/plain
Index: msgpack-1.0.0-static.patch
===================================================================
--- 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)
