From 57f29e80f17c7124f456aec36568c396d815a760 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Mon, 10 Oct 2016 02:58:43 +0000 Subject: gecko: factor out explicit USE_GCC Excluding toolchain bugs the following is equivalent # Not supported yet USES= compiler:c++14-lib vs. USES= compiler:c++14-lang FAVORITE_COMPILER= gcc --- Mk/bsd.gecko.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 76ebc74c0c50..06749566bb68 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -85,7 +85,7 @@ MOZILLA_VER?= ${PORTVERSION} MOZILLA_BIN?= ${PORTNAME}-bin MOZILLA_EXEC_NAME?=${MOZILLA} MOZ_RPATH?= ${MOZILLA} -USES+= cpe compiler:c++11-lang gmake iconv perl5 pkgconfig \ +USES+= cpe gmake iconv perl5 pkgconfig \ python:2.7,build desktop-file-utils CPE_VENDOR?=mozilla USE_PERL5= build @@ -96,9 +96,11 @@ BUNDLE_LIBS= yes .endif # call to implicitly-deleted copy constructor of 'mozilla::WidevineVideoFrame' -. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000019 && ${MOZILLA_VER:R:R} >= 49 -# XXX USES=compiler:c++11-lib cannot be used due to ports/208538 -USE_GCC= 5+ +.if ${MOZILLA_VER:R:R} >= 49 +USES+= compiler:c++14-lang +FAVORITE_COMPILER= gcc # c++14-lib +.else +USES+= compiler:c++11-lang .endif MOZILLA_SUFX?= none -- cgit v1.2.3