Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 13 Oct 2016 13:30:52 +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: r423915 - head/emulators/citra
Message-ID:  <201610131330.u9DDUqTO055494@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610131330.u9DDUqTO055494>