mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-04-30 04:47:28 -07:00
f51e8ea15c
Closes: https://bugs.gentoo.org/969568 Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/45639 Closes: https://github.com/gentoo/gentoo/pull/45639 Signed-off-by: Sam James <sam@gentoo.org>
55 lines
2.5 KiB
Diff
55 lines
2.5 KiB
Diff
See PR pending https://github.com/zaphoyd/websocketpp/pull/1189.patch
|
|
fix boost_1.89 bug #969568
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -112,7 +112,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
|
|
|
|
# Visual studio
|
|
if (MSVC)
|
|
- set (WEBSOCKETPP_BOOST_LIBS system thread)
|
|
+ set (WEBSOCKETPP_BOOST_LIBS thread)
|
|
set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL /Gy /GF /Ox /Ob2 /Ot /Oi /MP /arch:SSE2 /fp:fast")
|
|
set (CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG /INCREMENTAL:NO /OPT:REF /OPT:ICF")
|
|
add_definitions (/W3 /wd4996 /wd4995 /wd4355)
|
|
@@ -129,7 +129,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
|
|
set (WEBSOCKETPP_PLATFORM_LIBS pthread)
|
|
endif()
|
|
set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto)
|
|
- set (WEBSOCKETPP_BOOST_LIBS system thread)
|
|
+ set (WEBSOCKETPP_BOOST_LIBS thread)
|
|
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
|
|
if (NOT APPLE)
|
|
add_definitions (-DNDEBUG -Wall -Wcast-align) # todo: should we use CMAKE_C_FLAGS for these?
|
|
@@ -139,7 +139,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
|
|
execute_process (COMMAND ${CMAKE_CXX_COMPILER} "-dumpversion" OUTPUT_VARIABLE GCC_VERSION)
|
|
if ("${GCC_VERSION}" STRGREATER "4.4.0")
|
|
message("* C++11 support partially enabled due to GCC version ${GCC_VERSION}")
|
|
- set (WEBSOCKETPP_BOOST_LIBS system thread)
|
|
+ set (WEBSOCKETPP_BOOST_LIBS thread)
|
|
endif ()
|
|
endif ()
|
|
|
|
@@ -151,7 +151,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
|
|
set (WEBSOCKETPP_PLATFORM_LIBS pthread)
|
|
endif()
|
|
set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto)
|
|
- set (WEBSOCKETPP_BOOST_LIBS system thread)
|
|
+ set (WEBSOCKETPP_BOOST_LIBS thread)
|
|
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
|
|
if (NOT APPLE)
|
|
add_definitions (-DNDEBUG -Wall -Wno-padded) # todo: should we use CMAKE_C_FLAGS for these?
|
|
@@ -213,9 +213,8 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
|
|
set (Boost_FIND_QUIETLY TRUE)
|
|
set (Boost_DEBUG FALSE)
|
|
set (Boost_USE_MULTITHREADED TRUE)
|
|
- set (Boost_ADDITIONAL_VERSIONS "1.39.0" "1.40.0" "1.41.0" "1.42.0" "1.43.0" "1.44.0" "1.46.1") # todo: someone who knows better spesify these!
|
|
|
|
- find_package (Boost 1.39.0 COMPONENTS "${WEBSOCKETPP_BOOST_LIBS}")
|
|
+ find_package (Boost 1.69.0 COMPONENTS ${WEBSOCKETPP_BOOST_LIBS})
|
|
|
|
if (Boost_FOUND)
|
|
# Boost is a project wide global dependency.
|
|
--
|
|
2.52.0
|
|
|