From owner-svn-ports-all@freebsd.org Thu Oct 13 14:05:43 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8282EC10404; Thu, 13 Oct 2016 14:05:43 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3F9B0146F; Thu, 13 Oct 2016 14:05:43 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9DE5gE3068078; Thu, 13 Oct 2016 14:05:42 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9DE5ggV068077; Thu, 13 Oct 2016 14:05:42 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201610131405.u9DE5ggV068077@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 13 Oct 2016 14:05:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r423919 - head/emulators/citra/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Oct 2016 14:05:43 -0000 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>; ~~~~~^~~~~~~~~~~~~~~ tuple_element /usr/include/c++/v1/__tuple:44:62: note: 'tuple_element' declared here template 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>; + ~~~~~^~~~~~~~~~~~~~~ + tuple_element + /usr/include/c++/v1/__tuple:44:62: note: 'tuple_element' declared here + template 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 + #include + ++#ifdef __FreeBSD__ ++#include ++# if defined(_LIBCPP_VERSION) && __FreeBSD_version < 1001508 ++// Copied from ++namespace std { ++ template ++ using tuple_element_t = typename tuple_element <_Ip, _Tp...>::type; ++} ++# endif ++#endif ++ + namespace Dynarmic { + namespace mp { +