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/Makefile 3 Oct 2020 13:17:04 -0000 1.100
+++ devel/boost/Makefile 24 Oct 2020 02:38:57 -0000
@@ -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 <bsd.port.arch.mk>
@@ -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 -0000 1.11
+++ devel/boost/distinfo 24 Oct 2020 02:38:57 -0000
@@ -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 -0000 1.7
+++ devel/boost/patches/patch-Jamroot 24 Oct 2020 02:38:57 -0000
@@ -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 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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 <experimental/string_view> so use <string_view> if present
-instead.
-
-libestdc++ provides <string_view> starting with gcc-7.1.0:
- https://github.com/gcc-mirror/gcc/commit/76d7f2c208a23ceeffb5e9b8ebe3ce9cc91c4870#diff-077b1e7070de8a0ee56e6c5c2c4c0cc5
-
-Index: boost/asio/detail/config.hpp
---- boost/asio/detail/config.hpp.orig
-+++ boost/asio/detail/config.hpp
-@@ -803,7 +803,9 @@
- # if !defined(BOOST_ASIO_DISABLE_STD_EXPERIMENTAL_STRING_VIEW)
- # if defined(__clang__)
- # if (__cplusplus >= 201402)
--# if __has_include(<experimental/string_view>)
-+# if __has_include(<string_view>)
-+# define BOOST_ASIO_HAS_STD_STRING_VIEW 1
-+# elif __has_include(<experimental/string_view>)
- # define BOOST_ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
- # endif // __has_include(<experimental/string_view>)
- # endif // (__cplusplus >= 201402)
Index: devel/boost/patches/patch-boost_asio_detail_impl_socket_ops_ipp
===================================================================
RCS file: devel/boost/patches/patch-boost_asio_detail_impl_socket_ops_ipp
diff -N devel/boost/patches/patch-boost_asio_detail_impl_socket_ops_ipp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/boost/patches/patch-boost_asio_detail_impl_socket_ops_ipp 24 Oct 2020 02:38:57 -0000
@@ -0,0 +1,31 @@
+$OpenBSD$
+
+Use MSG_NOSIGNAL with sendmsg().
+
+Index: boost/asio/detail/impl/socket_ops.ipp
+--- boost/asio/detail/impl/socket_ops.ipp.orig
++++ boost/asio/detail/impl/socket_ops.ipp
+@@ -1178,9 +1178,9 @@ signed_size_type send(socket_type s, const buf* bufs,
+ msghdr msg = msghdr();
+ msg.msg_iov = const_cast<buf*>(bufs);
+ msg.msg_iovlen = static_cast<int>(count);
+-#if defined(__linux__)
++#if defined(MSG_NOSIGNAL)
+ flags |= MSG_NOSIGNAL;
+-
No comments:
Post a Comment