From owner-svn-ports-branches@freebsd.org Fri Dec 9 14:44:47 2016 Return-Path: Delivered-To: svn-ports-branches@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 E7684C68FC1; Fri, 9 Dec 2016 14:44:47 +0000 (UTC) (envelope-from cpm@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 9DFC813DE; Fri, 9 Dec 2016 14:44:47 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB9Eikk9008581; Fri, 9 Dec 2016 14:44:46 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB9EikV4008579; Fri, 9 Dec 2016 14:44:46 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201612091444.uB9EikV4008579@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Fri, 9 Dec 2016 14:44:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r428211 - in branches/2016Q4/www/chromium: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Dec 2016 14:44:48 -0000 Author: cpm Date: Fri Dec 9 14:44:46 2016 New Revision: 428211 URL: https://svnweb.freebsd.org/changeset/ports/428211 Log: MFH: r428044 www/chromium: Fix build on 10.1-RELEASE Unbreak build on 10.1-RELEASE after r426855 Submitted by: cpm Reviewed by: chromium (rene) Approved by: chromium (rene), feld (mentor, explicit) Differential Revision: D8699 Approved by: ports-secteam (junovitch) Modified: branches/2016Q4/www/chromium/Makefile branches/2016Q4/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/www/chromium/Makefile ============================================================================== --- branches/2016Q4/www/chromium/Makefile Fri Dec 9 14:43:45 2016 (r428210) +++ branches/2016Q4/www/chromium/Makefile Fri Dec 9 14:44:46 2016 (r428211) @@ -190,7 +190,8 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch- .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1002000 BUILD_DEPENDS+= ${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++ -CXXFLAGS+= -stdlib=libc++ -isystem ${LOCALBASE}/include/c++/v1 +GN_ARGS+= extra_cxxflags="-stdlib=libc++ -isystem ${LOCALBASE}/include/c++/v1" \ + extra_ldflags="-L${LOCALBASE}/lib" .endif .if ${OSVERSION} < 1100000 Modified: branches/2016Q4/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni ============================================================================== --- branches/2016Q4/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni Fri Dec 9 14:43:45 2016 (r428210) +++ branches/2016Q4/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni Fri Dec 9 14:44:46 2016 (r428211) @@ -1,6 +1,18 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2016-10-06 04:02:08.000000000 +0300 -+++ build/toolchain/gcc_toolchain.gni 2016-10-13 10:28:11.777849000 +0300 -@@ -453,14 +453,28 @@ +--- build/toolchain/gcc_toolchain.gni.orig 2016-11-10 20:02:09 UTC ++++ build/toolchain/gcc_toolchain.gni +@@ -10,6 +10,11 @@ import("//build/toolchain/cc_wrapper.gni + import("//build/toolchain/goma.gni") + import("//build/toolchain/toolchain.gni") + ++declare_args() { ++ extra_cxxflags = "" ++ extra_ldflags = "" ++} ++ + # This template defines a toolchain for something that works like gcc + # (including clang). + # +@@ -453,14 +458,28 @@ template("clang_toolchain") { } gcc_toolchain(target_name) {