svn commit: r431170 - in head/www/chromium: . files
Carlos J. Puga Medina
cpm at FreeBSD.org
Wed Jan 11 10:26:35 UTC 2017
Author: cpm
Date: Wed Jan 11 10:26:33 2017
New Revision: 431170
URL: https://svnweb.freebsd.org/changeset/ports/431170
Log:
- Fix build on HEAD
In file included from ../../services/ui/ws/window_manager_state.cc:5:
In file included from ../../services/ui/ws/window_manager_state.h:10:
In file included from /usr/include/c++/v1/memory:599:
/usr/include/c++/v1/__config:58:2: error: "_LIBCPP_TRIVIAL_PAIR_COPY_CTOR" is no longer supported. use _LIBCPP_DEPRECATED_ABI_DISABLE_PAIR_TRIVIAL_COPY_CTOR instead
#error "_LIBCPP_TRIVIAL_PAIR_COPY_CTOR" is no longer supported. \
^
1 error generated.
PR: 214654
Submitted by: dim
Reported by: jbeich
Reviewed by: rene
Approved by: chromium (rene)
MFH: 2017Q1
Added:
head/www/chromium/files/extra-patch-libc++-new (contents, props changed)
head/www/chromium/files/extra-patch-libc++-old (contents, props changed)
Modified:
head/www/chromium/Makefile
Modified: head/www/chromium/Makefile
==============================================================================
--- head/www/chromium/Makefile Wed Jan 11 10:08:38 2017 (r431169)
+++ head/www/chromium/Makefile Wed Jan 11 10:26:33 2017 (r431170)
@@ -187,6 +187,12 @@ GN_ARGS+= is_clang=true
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang
.endif
+.if ${OSVERSION} < 1200017
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-old
+.else
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-new
+.endif
+
.if ${OSVERSION} < 1100000
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-10
.endif
Added: head/www/chromium/files/extra-patch-libc++-new
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/extra-patch-libc++-new Wed Jan 11 10:26:33 2017 (r431170)
@@ -0,0 +1,14 @@
+--- services/ui/ws/BUILD.gn.orig 2016-12-09 17:47:26.343517000 +0000
++++ services/ui/ws/BUILD.gn 2016-12-09 17:48:45.323876000 +0000
+@@ -103,6 +103,11 @@
+ "window_tree_host_factory.h",
+ ]
+
++ # Work around base r261801
++ if (is_bsd) {
++ defines = ["_LIBCPP_ABI_UNSTABLE=1"]
++ }
++
+ deps = [
+ # TODO(sad): Temporary, until the GPU process is split out of ws.
+ "//services/ui/gpu",
Added: head/www/chromium/files/extra-patch-libc++-old
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/extra-patch-libc++-old Wed Jan 11 10:26:33 2017 (r431170)
@@ -0,0 +1,14 @@
+--- services/ui/ws/BUILD.gn.orig 2016-12-09 17:47:26.343517000 +0000
++++ services/ui/ws/BUILD.gn 2016-12-09 17:50:06.387679000 +0000
+@@ -103,6 +103,11 @@
+ "window_tree_host_factory.h",
+ ]
+
++ # Work around base r261801
++ if (is_bsd) {
++ defines = ["_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1"]
++ }
++
+ deps = [
+ # TODO(sad): Temporary, until the GPU process is split out of ws.
+ "//services/ui/gpu",
More information about the svn-ports-all
mailing list