Date: Tue, 11 Oct 2016 16:22:23 +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: r423780 - head/Mk Message-ID: <201610111622.u9BGMNHg013659@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610111622.u9BGMNHg013659>