Date: Fri, 9 Dec 2016 14:44:46 +0000 (UTC) From: "Carlos J. Puga Medina" <cpm@FreeBSD.org> 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 Message-ID: <201612091444.uB9EikV4008579@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612091444.uB9EikV4008579>