Date: Thu, 18 Jan 2018 18:26:13 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459366 - in head/devel/cpprestsdk: . files Message-ID: <201801181826.w0IIQDof029658@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Thu Jan 18 18:26:13 2018 New Revision: 459366 URL: https://svnweb.freebsd.org/changeset/ports/459366 Log: devel/cpprestsdk: unbreak with boost 1.66 Submitted by: rozhuk.im@gmail.com Obtained from: upstream Approved by: portmgr blanket Added: head/devel/cpprestsdk/files/patch-git_6b2e048001 (contents, props changed) Modified: head/devel/cpprestsdk/Makefile (contents, props changed) Modified: head/devel/cpprestsdk/Makefile ============================================================================== --- head/devel/cpprestsdk/Makefile Thu Jan 18 17:32:31 2018 (r459365) +++ head/devel/cpprestsdk/Makefile Thu Jan 18 18:26:13 2018 (r459366) @@ -12,8 +12,6 @@ COMMENT= Microsoft C++ REST SDK LICENSE= MIT LICENSE_FILE= ${WRKSRC}/../license.txt -BROKEN= fails to build with boost 1.66, see bug 224093 - LIB_DEPENDS= libboost_system.so:devel/boost-libs USE_GITHUB= yes Added: head/devel/cpprestsdk/files/patch-git_6b2e048001 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/cpprestsdk/files/patch-git_6b2e048001 Thu Jan 18 18:26:13 2018 (r459366) @@ -0,0 +1,34 @@ +This fixes the build against Boost 1.66 + +In file included from src/websockets/client/ws_client_wspp.cpp:28: +In file included from libs/websocketpp/websocketpp/config/asio_client.hpp:32: +In file included from libs/websocketpp/websocketpp/transport/asio/endpoint.hpp:32: +libs/websocketpp/websocketpp/transport/asio/connection.hpp:425:24: error: no matching function for call to 'make_shared' + m_strand = lib::make_shared<boost::asio::strand>( + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +/usr/include/c++/v1/memory:4642:1: note: candidate template ignored: invalid explicitly-specified argument for template parameter '_Tp' +make_shared(_Args&& ...__args) +^ + +From 6b2e0480018530b616f61d5cdc786c92ba148bb7 Mon Sep 17 00:00:00 2001 +From: John Hruby <johnh@vitrium.com> +Date: Tue, 26 Dec 2017 16:52:13 +0100 +Subject: [PATCH] fixed strand + +--- + Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp b/Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp +index 0be40f6b..395632c3 100644 +--- libs/websocketpp/websocketpp/transport/asio/connection.hpp ++++ libs/websocketpp/websocketpp/transport/asio/connection.hpp +@@ -422,7 +422,7 @@ class connection : public config::socket_type::socket_con_type { + m_io_service = io_service; + + if (config::enable_multithreading) { +- m_strand = lib::make_shared<boost::asio::strand>( ++ m_strand = lib::make_shared<boost::asio::io_service::strand>( + lib::ref(*io_service)); + + m_async_read_handler = m_strand->wrap(lib::bind(
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801181826.w0IIQDof029658>