Date: Thu, 13 Oct 2016 14:05:42 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r423919 - head/emulators/citra/files Message-ID: <201610131405.u9DE5ggV068077@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Thu Oct 13 14:05:42 2016 New Revision: 423919 URL: https://svnweb.freebsd.org/changeset/ports/423919 Log: emulators/citra: unbreak on < 10.2 after r423781 In file included from externals/dynarmic/src/frontend/disassembler/disassembler_arm.cpp:15: In file included from externals/dynarmic/src/./frontend/decoder/arm.h:18: In file included from externals/dynarmic/src/./frontend/decoder/decoder_detail.h:14: externals/dynarmic/src/./common/mp.h:34:27: fatal error: no template named 'tuple_element_t' in namespace 'std'; did you mean 'tuple_element'? using type = std::tuple_element_t<ParameterIndex, std::tuple<Args...>>; ~~~~~^~~~~~~~~~~~~~~ tuple_element /usr/include/c++/v1/__tuple:44:62: note: 'tuple_element' declared here template <size_t _Ip, class _Tp> class _LIBCPP_TYPE_VIS_ONLY tuple_element; ^ Reported by: pkg-fallout Added: head/emulators/citra/files/ head/emulators/citra/files/patch-externals_dynarmic_src_common_mp.h (contents, props changed) Added: head/emulators/citra/files/patch-externals_dynarmic_src_common_mp.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/citra/files/patch-externals_dynarmic_src_common_mp.h Thu Oct 13 14:05:42 2016 (r423919) @@ -0,0 +1,34 @@ +std::tuple_element_t appeared in FreeBSD 10.2 (libcxx r202673) but +USES=compiler cannot pull newer C++14-compatible libc++ version. + + In file included from externals/dynarmic/src/frontend/disassembler/disassembler_arm.cpp:15: + In file included from externals/dynarmic/src/./frontend/decoder/arm.h:18: + In file included from externals/dynarmic/src/./frontend/decoder/decoder_detail.h:14: + externals/dynarmic/src/./common/mp.h:34:27: fatal error: no template named 'tuple_element_t' in namespace 'std'; did you mean 'tuple_element'? + using type = std::tuple_element_t<ParameterIndex, std::tuple<Args...>>; + ~~~~~^~~~~~~~~~~~~~~ + tuple_element + /usr/include/c++/v1/__tuple:44:62: note: 'tuple_element' declared here + template <size_t _Ip, class _Tp> class _LIBCPP_TYPE_VIS_ONLY tuple_element; + ^ + +--- externals/dynarmic/src/common/mp.h.orig 2016-09-14 22:03:09 UTC ++++ externals/dynarmic/src/common/mp.h +@@ -9,6 +9,17 @@ + #include <cstddef> + #include <tuple> + ++#ifdef __FreeBSD__ ++#include <osreldate.h> ++# if defined(_LIBCPP_VERSION) && __FreeBSD_version < 1001508 ++// Copied from <tuple> ++namespace std { ++ template <size_t _Ip, class ..._Tp> ++ using tuple_element_t = typename tuple_element <_Ip, _Tp...>::type; ++} ++# endif ++#endif ++ + namespace Dynarmic { + namespace mp { +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610131405.u9DE5ggV068077>