From owner-svn-ports-head@freebsd.org  Thu Oct 13 13:30:53 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 747D1C10B1A;
 Thu, 13 Oct 2016 13:30:53 +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 42EA4D73;
 Thu, 13 Oct 2016 13:30:53 +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 u9DDUql7055495;
 Thu, 13 Oct 2016 13:30:52 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9DDUqTO055494;
 Thu, 13 Oct 2016 13:30:52 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201610131330.u9DDUqTO055494@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Thu, 13 Oct 2016 13:30:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r423915 - head/emulators/citra
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Oct 2016 13:30:53 -0000

Author: jbeich
Date: Thu Oct 13 13:30:52 2016
New Revision: 423915
URL: https://svnweb.freebsd.org/changeset/ports/423915

Log:
  emulators/citra: unbreak on < 10.2 after r423781
  
  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;
                                                               ^
  
  Reported by:	pkg-fallout

Modified:
  head/emulators/citra/Makefile   (contents, props changed)

Modified: head/emulators/citra/Makefile
==============================================================================
--- head/emulators/citra/Makefile	Thu Oct 13 13:29:15 2016	(r423914)
+++ head/emulators/citra/Makefile	Thu Oct 13 13:30:52 2016	(r423915)
@@ -36,6 +36,8 @@ USES=		cmake:outsource compiler:c++14-la
 FAVORITE_COMPILER=	${COMPILER_TYPE} # c++14-lib
 CXXFLAGS+=	-D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \
 		-D_DECLARE_C99_LDBL_MATH # XXX ports/193528
+CXXFLAGS+=	${CXXFLAGS_${OPSYS}_${OSREL}}
+CXXFLAGS_FreeBSD_10.1=	-Dtuple_element_t=tuple_element # libcxx r202673 (c++14)
 LDFLAGS+=	-Wl,--as-needed # GL
 
 OPTIONS_MULTI=	GUI