mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
dev-cpp/websocketpp: fix boost_1.89
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>
This commit is contained in:
Nicolas PARLANT
committed by
Sam James
Sam James
parent
ff6364e6f1
commit
f51e8ea15c
@@ -0,0 +1,54 @@
|
||||
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
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
From 36b73da8958927f975b3d01a062aa6c0e149d97f Mon Sep 17 00:00:00 2001
|
||||
From: Peter Thorson <git@zaphoyd.com>
|
||||
Date: Mon, 27 Apr 2020 10:34:06 -0500
|
||||
Subject: [PATCH] [cmake] Remove quotes that was making it hard for cmake to
|
||||
find newer boost versions. fixes #855
|
||||
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
changelog.md | 3 +++
|
||||
2 files changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 3e9c80e84..ffcd8583b 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -215,7 +215,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
|
||||
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.39.0 COMPONENTS ${WEBSOCKETPP_BOOST_LIBS})
|
||||
|
||||
if (Boost_FOUND)
|
||||
# Boost is a project wide global dependency.
|
||||
@@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@@ -26,8 +26,6 @@ PATCHES=(
|
||||
# disable tests that are timing sensitive
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1461069
|
||||
"${FILESDIR}"/${PN}-0.8.1-disable-test_transport-test_transport_asio_timers.patch
|
||||
# https://github.com/zaphoyd/websocketpp/commit/36b73da8958927f975b3d01a062aa6c0e149d97f
|
||||
"${FILESDIR}"/${P}-fix-boost_find_component.patch
|
||||
# https://github.com/zaphoyd/websocketpp/commit/2c355d9ef0f3ed73fa96d0c6c31293086df36d74
|
||||
"${FILESDIR}"/${P}-fix-clang.patch
|
||||
# C++20 support from https://github.com/zaphoyd/websocketpp/commit/3197a520eb4c1e4754860441918a5930160373eb
|
||||
@@ -37,6 +35,8 @@ PATCHES=(
|
||||
"${WORKDIR}/${P}-boost-1.87-compat.patch"
|
||||
# https://github.com/zaphoyd/websocketpp/commit/deb0a334471362608958ce59a6b0bcd3e5b73c24
|
||||
"${FILESDIR}/${P}-cmake4.patch" # bug 953936
|
||||
# PR pending https://github.com/zaphoyd/websocketpp/pull/1189.patch
|
||||
"${FILESDIR}"/${P}-fix-boost1.89.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
|
||||
Reference in New Issue
Block a user