Re: UPDATE: Boost 1.70
On 10/24/2020 11:45 PM, Brad Smith wrote: Here is an update to Boost 1.70. I have already had 1.68 and 1.69 run through bulks on i386 and sparc64 which found the two issues that have been fixed so far. The builders are busy at the moment. Looking for any testing and feedback. According to Stuart there are no further build issues on i386 and the 3 issues that did come up have been patched.
Re: UPDATE: Boost 1.70
On Tue Nov 03, 2020 at 01:29:23PM -0500, Brad Smith wrote: > On 10/24/2020 11:45 PM, Brad Smith wrote: > > Here is an update to Boost 1.70. > > > > I have already had 1.68 and 1.69 run through bulks on i386 and sparc64 > > which found > > the two issues that have been fixed so far. The builders are busy at the > > moment. > > > > Looking for any testing and feedback. > > According to Stuart there are no further build issues on i386 and the 3 > issues that > did come up have been patched. > OK rsadowski@
Re: UPDATE: Boost 1.70
Hi, On Sat, Oct 31, 2020 at 7:20 PM Daniel Dickman wrote: > On Fri, 30 Oct 2020, Stuart Henderson wrote: > > > comms/sigrok/pulseview > > > > In file included from pulseview_autogen/mocs_compilation.cpp:6: > > In file included from pulseview_autogen/4KQHGSF5UX/moc_analogsegment.cpp:10: > > In file included from > > pulseview_autogen/4KQHGSF5UX/../../../pulseview-0.4.1/pv/data/analogsegment.hpp:23: > > In file included from > > pulseview_autogen/4KQHGSF5UX/../../../pulseview-0.4.1/pv/data/segment.hpp:24: > > In file included from /pobj/pulseview-0.4.1/pulseview-0.4.1/pv/util.hpp:28: > > /usr/local/include/boost/multiprecision/cpp_dec_float.hpp:613:12: error: > > implicit instantiation of undefined template > > 'boost::serialization::nvp' > > > > > > How about this? Does someone want to check it works with the in-tree > version of boost as well? Yes, I received the same diff from Brad. It's ok with me.
Re: UPDATE: Boost 1.70
On Sat, Oct 31, 2020 at 09:19:41PM -0400, Daniel Dickman wrote: > > > On Fri, 30 Oct 2020, Stuart Henderson wrote: > > > comms/sigrok/pulseview > > > > In file included from pulseview_autogen/mocs_compilation.cpp:6: > > In file included from pulseview_autogen/4KQHGSF5UX/moc_analogsegment.cpp:10: > > In file included from > > pulseview_autogen/4KQHGSF5UX/../../../pulseview-0.4.1/pv/data/analogsegment.hpp:23: > > In file included from > > pulseview_autogen/4KQHGSF5UX/../../../pulseview-0.4.1/pv/data/segment.hpp:24: > > In file included from /pobj/pulseview-0.4.1/pulseview-0.4.1/pv/util.hpp:28: > > /usr/local/include/boost/multiprecision/cpp_dec_float.hpp:613:12: error: > > implicit instantiation of undefined template > > 'boost::serialization::nvp' > > > > > > How about this? Does someone want to check it works with the in-tree > version of boost as well? > > diff -Nur pulseview/Makefile pulseview.new/Makefile > --- pulseview/MakefileFri Mar 8 15:00:40 2019 > +++ pulseview.new/MakefileSat Oct 31 20:58:58 2020 > @@ -1,8 +1,7 @@ > # $OpenBSD: Makefile,v 1.4 2019/03/08 20:00:40 cwen Exp $ > > COMMENT =command-line frontend for sigrok logic analyzer > -REVISION = 1 > - > +REVISION = 2 > SIGROK_PROJECT = pulseview > SIGROK_VERSION = 0.4.1 > > diff -Nur pulseview/patches/patch-pv_util_hpp > pulseview.new/patches/patch-pv_util_hpp > --- pulseview/patches/patch-pv_util_hpp Wed Dec 31 19:00:00 1969 > +++ pulseview.new/patches/patch-pv_util_hpp Sat Oct 31 21:11:35 2020 > @@ -0,0 +1,15 @@ > +$OpenBSD$ > + > +backport commit 136b891 to work around boost + clang10 issue > + > +Index: pv/util.hpp > +--- pv/util.hpp.orig > pv/util.hpp > +@@ -25,6 +25,7 @@ > + #include > + > + #ifndef Q_MOC_RUN > ++#include > + #include > + #endif > + I had sent the following diff from upstream to the MAINTAINER. The diff you have, from the git hash, is based on what I have. I built with both versions. Index: Makefile === RCS file: /cvs/ports/comms/sigrok/pulseview/Makefile,v retrieving revision 1.4 diff -u -p -u -p -r1.4 Makefile --- Makefile8 Mar 2019 20:00:40 - 1.4 +++ Makefile30 Oct 2020 19:52:38 - @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.4 2019/03/08 20:00:40 cwen Exp $ COMMENT = command-line frontend for sigrok logic analyzer -REVISION = 1 +REVISION = 2 SIGROK_PROJECT = pulseview SIGROK_VERSION = 0.4.1 Index: patches/patch-pv_util_hpp === RCS file: patches/patch-pv_util_hpp diff -N patches/patch-pv_util_hpp --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-pv_util_hpp 30 Oct 2020 19:52:38 - @@ -0,0 +1,17 @@ +$OpenBSD$ + +pv/util.hpp: Workaround for a Boost::serialization / clang++-10 issue. + +Index: pv/util.hpp +--- pv/util.hpp.orig pv/util.hpp +@@ -25,6 +25,9 @@ + #include + + #ifndef Q_MOC_RUN ++// Workaround for https://github.com/boostorg/serialization/issues/186 ++#include ++ + #include + #endif +
Re: UPDATE: Boost 1.70
On Fri, 30 Oct 2020, Stuart Henderson wrote: > comms/sigrok/pulseview > > In file included from pulseview_autogen/mocs_compilation.cpp:6: > In file included from pulseview_autogen/4KQHGSF5UX/moc_analogsegment.cpp:10: > In file included from > pulseview_autogen/4KQHGSF5UX/../../../pulseview-0.4.1/pv/data/analogsegment.hpp:23: > In file included from > pulseview_autogen/4KQHGSF5UX/../../../pulseview-0.4.1/pv/data/segment.hpp:24: > In file included from /pobj/pulseview-0.4.1/pulseview-0.4.1/pv/util.hpp:28: > /usr/local/include/boost/multiprecision/cpp_dec_float.hpp:613:12: error: > implicit instantiation of undefined template 'boost::serialization::nvp' > > How about this? Does someone want to check it works with the in-tree version of boost as well? diff -Nur pulseview/Makefile pulseview.new/Makefile --- pulseview/Makefile Fri Mar 8 15:00:40 2019 +++ pulseview.new/Makefile Sat Oct 31 20:58:58 2020 @@ -1,8 +1,7 @@ # $OpenBSD: Makefile,v 1.4 2019/03/08 20:00:40 cwen Exp $ COMMENT = command-line frontend for sigrok logic analyzer -REVISION = 1 - +REVISION = 2 SIGROK_PROJECT = pulseview SIGROK_VERSION = 0.4.1 diff -Nur pulseview/patches/patch-pv_util_hpp pulseview.new/patches/patch-pv_util_hpp --- pulseview/patches/patch-pv_util_hpp Wed Dec 31 19:00:00 1969 +++ pulseview.new/patches/patch-pv_util_hpp Sat Oct 31 21:11:35 2020 @@ -0,0 +1,15 @@ +$OpenBSD$ + +backport commit 136b891 to work around boost + clang10 issue + +Index: pv/util.hpp +--- pv/util.hpp.orig pv/util.hpp +@@ -25,6 +25,7 @@ + #include + + #ifndef Q_MOC_RUN ++#include + #include + #endif +
Re: UPDATE: Boost 1.70
On Fri Oct 30, 2020 at 09:04:53PM -0400, Daniel Dickman wrote:
>
>
> >
> > games/pokerth
> >
> > In file included from ../src/net/common/chatcleanermanager.cpp:32:
> > In file included from ../src/net/chatcleanermanager.h:36:
> > In file included from /usr/local/include/boost/asio.hpp:24:
> > In file included from
> > /usr/local/include/boost/asio/basic_datagram_socket.hpp:20:
> > In file included from /usr/local/include/boost/asio/basic_socket.hpp:27:
> > In file included from /usr/local/include/boost/asio/executor.hpp:338:
> > /usr/local/include/boost/asio/impl/executor.hpp:179:22: error: no member
> > named 'context' in 'std::__1::reference_wrapper'
> >
> >
>
> Think diff below might fix this one. Sourced from archlinux.
>
> With this I was able to check that the game starts up.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/pokerth/Makefile,v
> retrieving revision 1.47
> diff -u -p -u -r1.47 Makefile
> --- Makefile 20 Mar 2020 16:44:23 - 1.47
> +++ Makefile 31 Oct 2020 00:48:37 -
> @@ -5,7 +5,7 @@ COMMENT= texas hold'em poker game with o
> BROKEN-hppa =needs atomic ops
>
> DISTNAME = pokerth-1.1.2
> -REVISION = 5
> +REVISION = 6
>
> CATEGORIES= games x11
>
> Index:
> patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_connection_hpp
> ===
> RCS file:
> patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_connection_hpp
> diff -N
> patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_connection_hpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++
> patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_connection_hpp
>31 Oct 2020 00:48:37 -
> @@ -0,0 +1,29 @@
> +$OpenBSD$
> +
If you commit this diff, please add a quick comment here. Thanks!
> +Index: src/third_party/websocketpp/websocketpp/transport/asio/connection.hpp
> +---
> src/third_party/websocketpp/websocketpp/transport/asio/connection.hpp.orig
> src/third_party/websocketpp/websocketpp/transport/asio/connection.hpp
> +@@ -311,9 +311,10 @@ class connection : public config::socket_type::socket_
> + * needed.
> + */
> + timer_ptr set_timer(long duration, timer_handler callback) {
> +-timer_ptr new_timer = lib::make_shared(
> +-lib::ref(*m_io_service),
> +-lib::asio::milliseconds(duration)
> ++timer_ptr new_timer(
> ++new lib::asio::steady_timer(
> ++*m_io_service,
> ++lib::asio::milliseconds(duration))
> + );
> +
> + if (config::enable_multithreading) {
> +@@ -461,8 +462,7 @@ class connection : public config::socket_type::socket_
> + m_io_service = io_service;
> +
> + if (config::enable_multithreading) {
> +-m_strand = lib::make_shared(
> +-lib::ref(*io_service));
> ++m_strand.reset(new lib::asio::io_service::strand(*io_service));
> + }
> +
> + lib::error_code ec = socket_con_type::init_asio(io_service,
> m_strand,
> Index:
> patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_endpoint_hpp
> ===
> RCS file:
> patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_endpoint_hpp
> diff -N
> patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_endpoint_hpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++
> patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_endpoint_hpp
> 31 Oct 2020 00:48:37 -
> @@ -0,0 +1,36 @@
> +$OpenBSD$
> +
> +Index: src/third_party/websocketpp/websocketpp/transport/asio/endpoint.hpp
> +--- src/third_party/websocketpp/websocketpp/transport/asio/endpoint.hpp.orig
> src/third_party/websocketpp/websocketpp/transport/asio/endpoint.hpp
> +@@ -191,8 +191,7 @@ class endpoint : public config::socket_type { (public)
> +
> + m_io_service = ptr;
> + m_external_io_service = true;
> +-m_acceptor = lib::make_shared(
> +-lib::ref(*m_io_service));
> ++m_acceptor.reset(new lib::asio::ip::tcp::acceptor(*m_io_service));
> +
> + m_state = READY;
> + ec = lib::error_code();
> +@@ -660,9 +659,7 @@ class endpoint : public config::socket_type { (public)
> + * @since 0.3.0
> + */
> + void start_perpetual() {
> +-m_work = lib::make_shared(
> +-lib::ref(*m_io_service)
> +-);
> ++m_work.reset(new lib::asio::io_service::work(*m_io_service));
> + }
> +
> + /// Clears the endpoint's perpetual flag, allowing it to exit when empty
> +@@ -826,8 +823,7 @@ class endpoint : public config::socket_type { (public)
> +
> + // Create a resolver
> + if (!m_resolver) {
> +-m_resolver = lib::make_shared(
> +-
Re: UPDATE: Boost 1.70
On 10/30/2020 9:04 PM, Daniel Dickman wrote: games/pokerth In file included from ../src/net/common/chatcleanermanager.cpp:32: In file included from ../src/net/chatcleanermanager.h:36: In file included from /usr/local/include/boost/asio.hpp:24: In file included from /usr/local/include/boost/asio/basic_datagram_socket.hpp:20: In file included from /usr/local/include/boost/asio/basic_socket.hpp:27: In file included from /usr/local/include/boost/asio/executor.hpp:338: /usr/local/include/boost/asio/impl/executor.hpp:179:22: error: no member named 'context' in 'std::__1::reference_wrapper' Think diff below might fix this one. Sourced from archlinux. With this I was able to check that the game starts up. I had just started looking into this port. This saves me time. Thanks!
Re: UPDATE: Boost 1.70
>
> games/pokerth
>
> In file included from ../src/net/common/chatcleanermanager.cpp:32:
> In file included from ../src/net/chatcleanermanager.h:36:
> In file included from /usr/local/include/boost/asio.hpp:24:
> In file included from
> /usr/local/include/boost/asio/basic_datagram_socket.hpp:20:
> In file included from /usr/local/include/boost/asio/basic_socket.hpp:27:
> In file included from /usr/local/include/boost/asio/executor.hpp:338:
> /usr/local/include/boost/asio/impl/executor.hpp:179:22: error: no member
> named 'context' in 'std::__1::reference_wrapper'
>
>
Think diff below might fix this one. Sourced from archlinux.
With this I was able to check that the game starts up.
Index: Makefile
===
RCS file: /cvs/ports/games/pokerth/Makefile,v
retrieving revision 1.47
diff -u -p -u -r1.47 Makefile
--- Makefile20 Mar 2020 16:44:23 - 1.47
+++ Makefile31 Oct 2020 00:48:37 -
@@ -5,7 +5,7 @@ COMMENT=texas hold'em poker game with o
BROKEN-hppa = needs atomic ops
DISTNAME = pokerth-1.1.2
-REVISION = 5
+REVISION = 6
CATEGORIES=games x11
Index:
patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_connection_hpp
===
RCS file:
patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_connection_hpp
diff -N
patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_connection_hpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++
patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_connection_hpp
31 Oct 2020 00:48:37 -
@@ -0,0 +1,29 @@
+$OpenBSD$
+
+Index: src/third_party/websocketpp/websocketpp/transport/asio/connection.hpp
+--- src/third_party/websocketpp/websocketpp/transport/asio/connection.hpp.orig
src/third_party/websocketpp/websocketpp/transport/asio/connection.hpp
+@@ -311,9 +311,10 @@ class connection : public config::socket_type::socket_
+ * needed.
+ */
+ timer_ptr set_timer(long duration, timer_handler callback) {
+-timer_ptr new_timer = lib::make_shared(
+-lib::ref(*m_io_service),
+-lib::asio::milliseconds(duration)
++timer_ptr new_timer(
++new lib::asio::steady_timer(
++*m_io_service,
++lib::asio::milliseconds(duration))
+ );
+
+ if (config::enable_multithreading) {
+@@ -461,8 +462,7 @@ class connection : public config::socket_type::socket_
+ m_io_service = io_service;
+
+ if (config::enable_multithreading) {
+-m_strand = lib::make_shared(
+-lib::ref(*io_service));
++m_strand.reset(new lib::asio::io_service::strand(*io_service));
+ }
+
+ lib::error_code ec = socket_con_type::init_asio(io_service, m_strand,
Index:
patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_endpoint_hpp
===
RCS file:
patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_endpoint_hpp
diff -N
patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_endpoint_hpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++
patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_endpoint_hpp
31 Oct 2020 00:48:37 -
@@ -0,0 +1,36 @@
+$OpenBSD$
+
+Index: src/third_party/websocketpp/websocketpp/transport/asio/endpoint.hpp
+--- src/third_party/websocketpp/websocketpp/transport/asio/endpoint.hpp.orig
src/third_party/websocketpp/websocketpp/transport/asio/endpoint.hpp
+@@ -191,8 +191,7 @@ class endpoint : public config::socket_type { (public)
+
+ m_io_service = ptr;
+ m_external_io_service = true;
+-m_acceptor = lib::make_shared(
+-lib::ref(*m_io_service));
++m_acceptor.reset(new lib::asio::ip::tcp::acceptor(*m_io_service));
+
+ m_state = READY;
+ ec = lib::error_code();
+@@ -660,9 +659,7 @@ class endpoint : public config::socket_type { (public)
+ * @since 0.3.0
+ */
+ void start_perpetual() {
+-m_work = lib::make_shared(
+-lib::ref(*m_io_service)
+-);
++m_work.reset(new lib::asio::io_service::work(*m_io_service));
+ }
+
+ /// Clears the endpoint's perpetual flag, allowing it to exit when empty
+@@ -826,8 +823,7 @@ class endpoint : public config::socket_type { (public)
+
+ // Create a resolver
+ if (!m_resolver) {
+-m_resolver = lib::make_shared(
+-lib::ref(*m_io_service));
++m_resolver.reset(new lib::asio::ip::tcp::resolver(*m_io_service));
+ }
+
+ tcon->set_uri(u);
Index:
patches/patch-src_third_party_websocketpp_websocketpp_transport_asio_security_none_hpp
===
RCS file:
Re: UPDATE: Boost 1.70
graphics/orthanc/webviewer-plugin /pobj/orthanc-plugin-webviewer-2.3/OrthancWebViewer-2.3/Orthanc/Core/Toolbox.cpp:43:10: fatal error: 'boost/uuid/sha1.hpp' file not found #include comms/sigrok/pulseview In file included from pulseview_autogen/mocs_compilation.cpp:6: In file included from pulseview_autogen/4KQHGSF5UX/moc_analogsegment.cpp:10: In file included from pulseview_autogen/4KQHGSF5UX/../../../pulseview-0.4.1/pv/data/analogsegment.hpp:23: In file included from pulseview_autogen/4KQHGSF5UX/../../../pulseview-0.4.1/pv/data/segment.hpp:24: In file included from /pobj/pulseview-0.4.1/pulseview-0.4.1/pv/util.hpp:28: /usr/local/include/boost/multiprecision/cpp_dec_float.hpp:613:12: error: implicit instantiation of undefined template 'boost::serialization::nvp' games/pokerth In file included from ../src/net/common/chatcleanermanager.cpp:32: In file included from ../src/net/chatcleanermanager.h:36: In file included from /usr/local/include/boost/asio.hpp:24: In file included from /usr/local/include/boost/asio/basic_datagram_socket.hpp:20: In file included from /usr/local/include/boost/asio/basic_socket.hpp:27: In file included from /usr/local/include/boost/asio/executor.hpp:338: /usr/local/include/boost/asio/impl/executor.hpp:179:22: error: no member named 'context' in 'std::__1::reference_wrapper'
Re: UPDATE: Boost 1.70
On 10/25/2020 11:16 AM, Otto Moerbeek wrote: On Sat, Oct 24, 2020 at 11:45:02PM -0400, Brad Smith wrote: Here is an update to Boost 1.70. I have already had 1.68 and 1.69 run through bulks on i386 and sparc64 which found the two issues that have been fixed so far. The builders are busy at the moment. Looking for any testing and feedback. I used this to build & test PowerDNS Server, Recursor and dnsdist on arm64 with only this small issue: In file included from uuid-utils.cc:33: In file included from /usr/local/include/boost/uuid/uuid_generators.hpp:17: In file included from /usr/local/include/boost/uuid/random_generator.hpp:21: In file included from /usr/local/include/boost/uuid/detail/random_provider.hpp:29: In file included from /usr/local/include/boost/uuid/detail/random_provider_detect_platform.hpp:16: /usr/local/include/boost/predef/os/bsd/open.h:82:16: warning: 'BOOST_OS_BSD' macro redefined [-Wmacro-redefined] # define BOOST_OS_BSD BOOST_VERSION_NUMBER_AVAILABLE ^ /usr/local/include/boost/predef/os/bsd.h:59:9: note: previous definition is here #define BOOST_OS_BSD BOOST_VERSION_NUMBER_NOT_AVAILABLE -Otto Thanks. I opened a ticket upstream.
Re: UPDATE: Boost 1.70
On Sat, Oct 24, 2020 at 11:45:02PM -0400, Brad Smith wrote:
> Here is an update to Boost 1.70.
>
> I have already had 1.68 and 1.69 run through bulks on i386 and sparc64 which
> found
> the two issues that have been fixed so far. The builders are busy at the
> moment.
>
> Looking for any testing and feedback.
I used this to build & test PowerDNS Server, Recursor and dnsdist on arm64
with only this small issue:
In file included from uuid-utils.cc:33:
In file included from /usr/local/include/boost/uuid/uuid_generators.hpp:17:
In file included from /usr/local/include/boost/uuid/random_generator.hpp:21:
In file included from
/usr/local/include/boost/uuid/detail/random_provider.hpp:29:
In file included from
/usr/local/include/boost/uuid/detail/random_provider_detect_platform.hpp:16:
/usr/local/include/boost/predef/os/bsd/open.h:82:16: warning:
'BOOST_OS_BSD' macro redefined [-Wmacro-redefined]
# define BOOST_OS_BSD BOOST_VERSION_NUMBER_AVAILABLE
^
/usr/local/include/boost/predef/os/bsd.h:59:9: note: previous
definition is here
#define BOOST_OS_BSD BOOST_VERSION_NUMBER_NOT_AVAILABLE
-Otto
>
>
> Index: devel/boost/Makefile
> ===
> RCS file: /cvs/ports/devel/boost/Makefile,v
> retrieving revision 1.100
> diff -u -p -u -p -r1.100 Makefile
> --- devel/boost/Makefile 3 Oct 2020 13:17:04 - 1.100
> +++ devel/boost/Makefile 24 Oct 2020 02:38:57 -
> @@ -1,23 +1,20 @@
> # $OpenBSD: Makefile,v 1.100 2020/10/03 13:17:04 sthen Exp $
>
> -ONLY_FOR_ARCHS-md = aarch64 amd64 arm i386 powerpc
> +ONLY_FOR_ARCHS-md = aarch64 amd64 arm i386 mips64 mips64el powerpc powerpc64
>
> COMMENT-main=free peer-reviewed portable C++ source libraries
> COMMENT-md= machine-dependent libraries for boost
>
> -# XXX if updating, try to remove -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR
> -# XXX in archivers/innoextract
> -VERSION= 1.67.0
> +VERSION= 1.70.0
> DISTNAME=boost_${VERSION:S/./_/g}
> PKGNAME-main=boost-${VERSION}
> PKGNAME-md= boost-md-${VERSION}
> CATEGORIES= devel
> -MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=boost/}
> +MASTER_SITES=
> https://dl.bintray.com/boostorg/release/${VERSION}/source/
> EXTRACT_SUFX=.tar.bz2
> FIX_EXTRACT_PERMISSIONS =Yes
> -REVISION-main= 1
>
> -SO_VERSION= 11.0
> +SO_VERSION= 12.0
> BOOST_LIBS= boost_atomic-mt \
> boost_chrono-mt boost_chrono \
> boost_container-mt boost_container \
> @@ -43,13 +40,12 @@ BOOST_LIBS= boost_atomic-mt \
> boost_random-mt boost_random \
> boost_regex-mt boost_regex \
> boost_serialization-mt boost_serialization \
> - boost_signals-mt boost_signals \
> boost_system-mt boost_system \
> boost_thread-mt \
> boost_timer-mt boost_timer \
> boost_unit_test_framework-mt boost_unit_test_framework \
> boost_wserialization-mt boost_wserialization \
> - boost_wave-mt \
> + boost_wave-mt boost_wave \
> boost_type_erasure-mt boost_type_erasure \
> boost_contract boost_contract-mt
>
> @@ -95,9 +91,8 @@ LIB_DEPENDS=archivers/bzip2 \
>
> LIB_DEPENDS-md= devel/boost
>
> -WANTLIB-md+= ${COMPILER_LIBCXX} m
> -WANTLIB-md+= boost_chrono-mt boost_filesystem-mt boost_system-mt
> -WANTLIB-md+= boost_system boost_thread-mt
> +WANTLIB-md+= ${COMPILER_LIBCXX} m boost_chrono-mt boost_filesystem-mt
> +WANTLIB-md+= boost_thread-mt
>
> .include
>
> @@ -115,7 +110,7 @@ BJAM_CONFIG= -sICU_PATH=${LOCALBASE} \
> -q \
> -d+2 \
> -j${MAKE_JOBS} \
> - --layout=tagged \
> + --layout=tagged-1.66 \
> pch=off \
> cflags='${CFLAGS} -pthread' \
> cxxflags='${CXXFLAGS} -pthread' \
> Index: devel/boost/distinfo
> ===
> RCS file: /cvs/ports/devel/boost/distinfo,v
> retrieving revision 1.11
> diff -u -p -u -p -r1.11 distinfo
> --- devel/boost/distinfo 15 Aug 2020 20:30:40 - 1.11
> +++ devel/boost/distinfo 24 Oct 2020 02:38:57 -
> @@ -1,2 +1,2 @@
> -SHA256 (boost_1_67_0.tar.bz2) = JoTJcplO5X/FYy4DvwRHRvbrRdSSDDQ5N6Rl/Welrbo=
> -SIZE (boost_1_67_0.tar.bz2) = 87336566
> +SHA256 (boost_1_70_0.tar.bz2) = QwroNUeJ3k/RnuUvOx9znh+6V28K3tCJfDwrwA+zh3g=
> +SIZE (boost_1_70_0.tar.bz2) = 97887058
> Index: devel/boost/patches/patch-Jamroot
> ===
> RCS file: /cvs/ports/devel/boost/patches/patch-Jamroot,v
> retrieving revision 1.7
> diff -u -p -u -p -r1.7 patch-Jamroot
> --- devel/boost/patches/patch-Jamroot 15 Aug 2020 20:30:40 - 1.7
> +++ devel/boost/patches/patch-Jamroot 24 Oct 2020 02:38:57 -
> @@ -1,10 +1,11 @@
> $OpenBSD:
UPDATE: Boost 1.70
Here is an update to Boost 1.70.
I have already had 1.68 and 1.69 run through bulks on i386 and sparc64 which
found
the two issues that have been fixed so far. The builders are busy at the moment.
Looking for any testing and feedback.
Index: devel/boost/Makefile
===
RCS file: /cvs/ports/devel/boost/Makefile,v
retrieving revision 1.100
diff -u -p -u -p -r1.100 Makefile
--- devel/boost/Makefile3 Oct 2020 13:17:04 - 1.100
+++ devel/boost/Makefile24 Oct 2020 02:38:57 -
@@ -1,23 +1,20 @@
# $OpenBSD: Makefile,v 1.100 2020/10/03 13:17:04 sthen Exp $
-ONLY_FOR_ARCHS-md = aarch64 amd64 arm i386 powerpc
+ONLY_FOR_ARCHS-md = aarch64 amd64 arm i386 mips64 mips64el powerpc powerpc64
COMMENT-main= free peer-reviewed portable C++ source libraries
COMMENT-md=machine-dependent libraries for boost
-# XXX if updating, try to remove -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR
-# XXX in archivers/innoextract
-VERSION= 1.67.0
+VERSION= 1.70.0
DISTNAME= boost_${VERSION:S/./_/g}
PKGNAME-main= boost-${VERSION}
PKGNAME-md=boost-md-${VERSION}
CATEGORIES=devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=boost/}
+MASTER_SITES= https://dl.bintray.com/boostorg/release/${VERSION}/source/
EXTRACT_SUFX= .tar.bz2
FIX_EXTRACT_PERMISSIONS = Yes
-REVISION-main= 1
-SO_VERSION=11.0
+SO_VERSION=12.0
BOOST_LIBS=boost_atomic-mt \
boost_chrono-mt boost_chrono \
boost_container-mt boost_container \
@@ -43,13 +40,12 @@ BOOST_LIBS= boost_atomic-mt \
boost_random-mt boost_random \
boost_regex-mt boost_regex \
boost_serialization-mt boost_serialization \
- boost_signals-mt boost_signals \
boost_system-mt boost_system \
boost_thread-mt \
boost_timer-mt boost_timer \
boost_unit_test_framework-mt boost_unit_test_framework \
boost_wserialization-mt boost_wserialization \
- boost_wave-mt \
+ boost_wave-mt boost_wave \
boost_type_erasure-mt boost_type_erasure \
boost_contract boost_contract-mt
@@ -95,9 +91,8 @@ LIB_DEPENDS= archivers/bzip2 \
LIB_DEPENDS-md=devel/boost
-WANTLIB-md+= ${COMPILER_LIBCXX} m
-WANTLIB-md+= boost_chrono-mt boost_filesystem-mt boost_system-mt
-WANTLIB-md+= boost_system boost_thread-mt
+WANTLIB-md+= ${COMPILER_LIBCXX} m boost_chrono-mt boost_filesystem-mt
+WANTLIB-md+= boost_thread-mt
.include
@@ -115,7 +110,7 @@ BJAM_CONFIG=-sICU_PATH=${LOCALBASE} \
-q \
-d+2 \
-j${MAKE_JOBS} \
- --layout=tagged \
+ --layout=tagged-1.66 \
pch=off \
cflags='${CFLAGS} -pthread' \
cxxflags='${CXXFLAGS} -pthread' \
Index: devel/boost/distinfo
===
RCS file: /cvs/ports/devel/boost/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- devel/boost/distinfo15 Aug 2020 20:30:40 - 1.11
+++ devel/boost/distinfo24 Oct 2020 02:38:57 -
@@ -1,2 +1,2 @@
-SHA256 (boost_1_67_0.tar.bz2) = JoTJcplO5X/FYy4DvwRHRvbrRdSSDDQ5N6Rl/Welrbo=
-SIZE (boost_1_67_0.tar.bz2) = 87336566
+SHA256 (boost_1_70_0.tar.bz2) = QwroNUeJ3k/RnuUvOx9znh+6V28K3tCJfDwrwA+zh3g=
+SIZE (boost_1_70_0.tar.bz2) = 97887058
Index: devel/boost/patches/patch-Jamroot
===
RCS file: /cvs/ports/devel/boost/patches/patch-Jamroot,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-Jamroot
--- devel/boost/patches/patch-Jamroot 15 Aug 2020 20:30:40 - 1.7
+++ devel/boost/patches/patch-Jamroot 24 Oct 2020 02:38:57 -
@@ -1,10 +1,11 @@
$OpenBSD: patch-Jamroot,v 1.7 2020/08/15 20:30:40 rsadowski Exp $
+
Index: Jamroot
--- Jamroot.orig
+++ Jamroot
-@@ -139,8 +139,9 @@ import option ;
+@@ -145,8 +145,9 @@ import tools/boost_install/boost-install ;
path-constant BOOST_ROOT : . ;
- constant BOOST_VERSION : 1.67.0 ;
+ constant BOOST_VERSION : 1.70.0 ;
constant BOOST_JAMROOT_MODULE : $(__name__) ;
+constant SO_VERSION : ${SO_VERSION} ;
Index: devel/boost/patches/patch-boost_asio_detail_config_hpp
===
RCS file: devel/boost/patches/patch-boost_asio_detail_config_hpp
diff -N devel/boost/patches/patch-boost_asio_detail_config_hpp
--- devel/boost/patches/patch-boost_asio_detail_config_hpp 15 Aug 2020
20:30:40 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,22 +0,0 @@
-$OpenBSD: patch-boost_asio_detail_config_hpp,v 1.2 2020/08/15 20:30:40
rsadowski Exp $
-
-libc++-7 deprecates so use if present
-instead.
-
-libestdc++ provides starting with gcc-7.1.0:
-
