On Tue, Feb 05 2019, Stuart Henderson <[email protected]> wrote:
> It hasn't finished a full build yet (still running), but at least has
> got past the previous breakage point.
>
> ok if it finishes?
It fixes the build on amd64, ok jca@
I would have kept a fallback on <experimental/string_view> for
clang-using-libestdc++ (what I tried to do with my devel/boost patch).
But since this port is already only for i386/amd64, I'm not sure it's
relevant.
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/emulators/mame/Makefile,v
> retrieving revision 1.20
> diff -u -p -r1.20 Makefile
> --- Makefile 4 Feb 2019 10:12:52 -0000 1.20
> +++ Makefile 5 Feb 2019 15:25:19 -0000
> @@ -82,6 +82,7 @@ post-extract:
> xargs sed -i 's|"png.h"|"localpng.h"|'
> @perl -pi -e 's/\r//g' ${WRKSRC}/makefile ${WRKSRC}/scripts/genie.lua \
> ${WRKSRC}/3rdparty/genie/build/gmake.bsd/genie.make \
> + ${WRKSRC}/3rdparty/asio/include/asio/detail/config.hpp \
> ${WRKSRC}/docs/man/* ${WRKSRC}/keymaps/*
>
> do-install:
> Index: patches/patch-3rdparty_asio_include_asio_detail_config_hpp
> ===================================================================
> RCS file: patches/patch-3rdparty_asio_include_asio_detail_config_hpp
> diff -N patches/patch-3rdparty_asio_include_asio_detail_config_hpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-3rdparty_asio_include_asio_detail_config_hpp 5 Feb
> 2019 15:25:19 -0000
> @@ -0,0 +1,18 @@
> +$OpenBSD$
> +
> +libc++ 7.x moved string_view out of experimental
> +
> +Index: 3rdparty/asio/include/asio/detail/config.hpp
> +--- 3rdparty/asio/include/asio/detail/config.hpp.orig
> ++++ 3rdparty/asio/include/asio/detail/config.hpp
> +@@ -708,9 +708,8 @@
> + # if !defined(ASIO_DISABLE_STD_STRING_VIEW)
> + # if defined(__clang__)
> + # if (__cplusplus >= 201103)
> +-# if __has_include(<experimental/string_view>)
> ++# if __has_include(<string_view>)
> + # define ASIO_HAS_STD_STRING_VIEW 1
> +-# define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
> + # endif // __has_include(<experimental/string_view>)
> + # endif // (__cplusplus >= 201103)
> + # endif // defined(__clang__)
>
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
