diff --git a/devel/boost/Makefile b/devel/boost/Makefile index eed5faa7952..0e92409e764 100644 --- a/devel/boost/Makefile +++ b/devel/boost/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.105 2020/12/15 18:53:17 otto Exp $ +# $OpenBSD: Makefile,v 1.106 2020/12/21 19:07:52 rsadowski Exp $ ONLY_FOR_ARCHS-md = aarch64 amd64 arm i386 mips64 mips64el powerpc powerpc64 @@ -6,7 +6,7 @@ COMMENT-main= free peer-reviewed portable C++ source libraries COMMENT-md= machine-dependent libraries for boost VERSION= 1.70.0 -REVISION= 1 +REVISION= 2 DISTNAME= boost_${VERSION:S/./_/g} PKGNAME-main= boost-${VERSION} PKGNAME-md= boost-md-${VERSION} diff --git a/devel/boost/patches/patch-boost_asio_detail_impl_socket_ops_ipp b/devel/boost/patches/patch-boost_asio_detail_impl_socket_ops_ipp index 1ad81ad4e6d..282acb25c71 100644 --- a/devel/boost/patches/patch-boost_asio_detail_impl_socket_ops_ipp +++ b/devel/boost/patches/patch-boost_asio_detail_impl_socket_ops_ipp @@ -1,4 +1,4 @@ -$OpenBSD: patch-boost_asio_detail_impl_socket_ops_ipp,v 1.1 2020/11/05 11:23:03 sthen Exp $ +$OpenBSD: patch-boost_asio_detail_impl_socket_ops_ipp,v 1.2 2020/12/21 19:07:53 rsadowski Exp $ Use MSG_NOSIGNAL with sendmsg(). @@ -13,7 +13,7 @@ Index: boost/asio/detail/impl/socket_ops.ipp +#if defined(MSG_NOSIGNAL) flags |= MSG_NOSIGNAL; -#endif // defined(__linux__) -+#endif // defined(MSG_NOSIGNAL ++#endif // defined(MSG_NOSIGNAL) signed_size_type result = error_wrapper(::sendmsg(s, &msg, flags), ec); if (result >= 0) ec = boost::system::error_code(); diff --git a/devel/boost/patches/patch-boost_config_compiler_clang_hpp b/devel/boost/patches/patch-boost_config_compiler_clang_hpp deleted file mode 100644 index 7174ff027e8..00000000000 --- a/devel/boost/patches/patch-boost_config_compiler_clang_hpp +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-boost_config_compiler_clang_hpp,v 1.7 2020/11/05 11:23:03 sthen Exp $ - -Index: boost/config/compiler/clang.hpp ---- boost/config/compiler/clang.hpp.orig -+++ boost/config/compiler/clang.hpp -@@ -332,7 +332,9 @@ - #endif - - // Clang has supported the 'unused' attribute since the first release. -+#if defined(__GNUC__) && (__GNUC__ >= 4) || defined(__clang__) - #define BOOST_ATTRIBUTE_UNUSED __attribute__((__unused__)) -+#endif - - // Type aliasing hint. - #if __has_attribute(__may_alias__) diff --git a/devel/boost/patches/patch-boost_predef_other_endian_h b/devel/boost/patches/patch-boost_predef_other_endian_h index dd7a79f9a6d..1157daa0f9d 100644 --- a/devel/boost/patches/patch-boost_predef_other_endian_h +++ b/devel/boost/patches/patch-boost_predef_other_endian_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-boost_predef_other_endian_h,v 1.2 2020/11/05 11:23:03 sthen Exp $ +$OpenBSD: patch-boost_predef_other_endian_h,v 1.3 2020/12/21 19:07:53 rsadowski Exp $ Index: boost/predef/other/endian.h --- boost/predef/other/endian.h.orig @@ -23,7 +23,7 @@ Index: boost/predef/other/endian.h -# endif +# endif +# if BOOST_OS_BSD -+ include ++# include # endif # endif # if defined(__BYTE_ORDER) diff --git a/devel/boost/patches/patch-boost_type_traits_is_convertible_hpp b/devel/boost/patches/patch-boost_type_traits_is_convertible_hpp deleted file mode 100644 index b9c8f9af550..00000000000 --- a/devel/boost/patches/patch-boost_type_traits_is_convertible_hpp +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-boost_type_traits_is_convertible_hpp,v 1.3 2020/11/05 11:23:03 sthen Exp $ - -Unbreak compilation with libc++ in non-c++11 mode. -The v1/__config uses #define decltype(__x) __decltype(__x), -which doesn't work for the decltype(x,y) case. - -Index: boost/type_traits/is_convertible.hpp ---- boost/type_traits/is_convertible.hpp.orig -+++ boost/type_traits/is_convertible.hpp -@@ -87,7 +87,7 @@ namespace detail { - static void test_aux(To1); - - template -- static decltype(test_aux(boost::declval()), one()) test(int); -+ static __decltype(test_aux(boost::declval()), one()) test(int); - - template - static two test(...); diff --git a/devel/boost/patches/patch-tools_build_src_tools_gcc_jam b/devel/boost/patches/patch-tools_build_src_tools_gcc_jam index ca22836bf87..14c515fe3ad 100644 --- a/devel/boost/patches/patch-tools_build_src_tools_gcc_jam +++ b/devel/boost/patches/patch-tools_build_src_tools_gcc_jam @@ -1,17 +1,8 @@ -$OpenBSD: patch-tools_build_src_tools_gcc_jam,v 1.8 2020/11/05 11:23:03 sthen Exp $ +$OpenBSD: patch-tools_build_src_tools_gcc_jam,v 1.9 2020/12/21 19:07:53 rsadowski Exp $ Index: tools/build/src/tools/gcc.jam --- tools/build/src/tools/gcc.jam.orig +++ tools/build/src/tools/gcc.jam -@@ -651,7 +651,7 @@ class gcc-pch-generator : pch-generator - # Return result of base class and pch-file property as - # usage-requirements. - return -- [ $(pch-file[1]).add-raw $(pch-file[2-]) -Winvalid-pch ] -+ [ $(pch-file[1]).add-raw $(pch-file[2-]) ] - $(pch-file[2-]) - ; - } @@ -703,7 +703,7 @@ actions compile.c.pch # Declare flags and action for compilation.