From owner-svn-ports-head@freebsd.org  Tue Oct 11 16:22:25 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 16214C0D99D;
 Tue, 11 Oct 2016 16:22:25 +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 DA9468E9;
 Tue, 11 Oct 2016 16:22:24 +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 u9BGMO2j013660;
 Tue, 11 Oct 2016 16:22:24 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9BGMNHg013659;
 Tue, 11 Oct 2016 16:22:23 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201610111622.u9BGMNHg013659@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: Tue, 11 Oct 2016 16:22:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r423780 - head/Mk
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: Tue, 11 Oct 2016 16:22:25 -0000

Author: jbeich
Date: Tue Oct 11 16:22:23 2016
New Revision: 423780
URL: https://svnweb.freebsd.org/changeset/ports/423780

Log:
  gecko: back out r423631 for 10.x bustage
  
  - DTRACE=on crashes building probes with libstdc++
  - libc++ by default conflicts with libstdc++ from USE_GCC
  
  PR:		213378
  Reported by:	dhw, tz, pkg-fallout, Philip Homburg

Modified:
  head/Mk/bsd.gecko.mk   (contents, props changed)

Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk	Tue Oct 11 16:12:05 2016	(r423779)
+++ head/Mk/bsd.gecko.mk	Tue Oct 11 16:22:23 2016	(r423780)
@@ -85,7 +85,7 @@ MOZILLA_VER?=	${PORTVERSION}
 MOZILLA_BIN?=	${PORTNAME}-bin
 MOZILLA_EXEC_NAME?=${MOZILLA}
 MOZ_RPATH?=	${MOZILLA}
-USES+=		cpe gmake iconv perl5 pkgconfig \
+USES+=		cpe compiler:c++11-lang gmake iconv perl5 pkgconfig \
 			python:2.7,build desktop-file-utils
 CPE_VENDOR?=mozilla
 USE_PERL5=	build
@@ -96,11 +96,9 @@ BUNDLE_LIBS=	yes
 .endif
 
 # call to implicitly-deleted copy constructor of 'mozilla::WidevineVideoFrame'
-.if ${MOZILLA_VER:R:R} >= 49
-USES+=		compiler:c++14-lang
-FAVORITE_COMPILER=	gcc # c++14-lib
-.else
-USES+=		compiler:c++11-lang
+.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+
 .endif
 
 MOZILLA_SUFX?=	none