cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify libc++7 workaround, tweaking config.hpp was enough

Browse Source 
Noticed by naddy@, ok Brad (maintainer)
This commit is contained in:
jca 2019-02-07 13:53:28 +00:00
parent 4b5cf1818c
commit 0ab3526081
2 changed files with 2 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/boost/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.81 2019/02/06 11:43:35 jca Exp $
# $OpenBSD: Makefile,v 1.82 2019/02/07 13:53:28 jca Exp $
COMMENT-main= free peer-reviewed portable C++ source libraries
COMMENT-md= machine-dependent libraries for boost
@ -9,7 +9,7 @@ VERSION= 1.66.0
DISTNAME= boost_${VERSION:S/./_/g}
PKGNAME-main= boost-${VERSION}
PKGNAME-md= boost-md-${VERSION}
REVISION-main= 3
REVISION-main= 4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=boost/}
EXTRACT_SUFX= .tar.bz2

43
devel/boost/patches/patch-boost_asio_detail_string_view_hpp
View File

@ -1,43 +0,0 @@
$OpenBSD: patch-boost_asio_detail_string_view_hpp,v 1.1 2019/02/06 11:43:35 jca 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/string_view.hpp
--- boost/asio/detail/string_view.hpp.orig
+++ boost/asio/detail/string_view.hpp
@@ -19,22 +19,22 @@
#if defined(BOOST_ASIO_HAS_STD_STRING_VIEW)
-#if defined(BOOST_ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW)
-# include <experimental/string_view>
-#else // defined(BOOST_ASIO_HAS_EXPERIMENTAL_STRING_VIEW)
+#if !defined(BOOST_ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW)
# include <string_view>
-#endif // defined(BOOST_ASIO_HAS_EXPERIMENTAL_STRING_VIEW)
+#else // !defined(BOOST_ASIO_HAS_EXPERIMENTAL_STRING_VIEW)
+# include <experimental/string_view>
+#endif // !defined(BOOST_ASIO_HAS_EXPERIMENTAL_STRING_VIEW)
namespace boost {
namespace asio {
-#if defined(BOOST_ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW)
-using std::experimental::basic_string_view;
-using std::experimental::string_view;
-#else // defined(BOOST_ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW)
+#if !defined(BOOST_ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW)
using std::basic_string_view;
using std::string_view;
-#endif // defined(BOOST_ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW)
+#else // !defined(BOOST_ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW)
+using std::experimental::basic_string_view;
+using std::experimental::string_view;
+#endif // !defined(BOOST_ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW)
} // namespace asio
} // namespace boost