svn commit: r428044 - in head/www/chromium: . files
Carlos J. Puga Medina
cpm at FreeBSD.org
Wed Dec 7 09:57:27 UTC 2016
Author: cpm
Date: Wed Dec 7 09:57:25 2016
New Revision: 428044
URL: https://svnweb.freebsd.org/changeset/ports/428044
Log:
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)
MFH: 2016Q4
Differential Revision: D8699
Modified:
head/www/chromium/Makefile
head/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
Modified: head/www/chromium/Makefile
==============================================================================
--- head/www/chromium/Makefile Wed Dec 7 09:51:26 2016 (r428043)
+++ head/www/chromium/Makefile Wed Dec 7 09:57:25 2016 (r428044)
@@ -191,7 +191,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: head/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
==============================================================================
--- head/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni Wed Dec 7 09:51:26 2016 (r428043)
+++ head/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni Wed Dec 7 09:57:25 2016 (r428044)
@@ -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) {
More information about the svn-ports-head
mailing list