diff options
| author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2017-01-11 10:26:33 +0000 |
|---|---|---|
| committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2017-01-11 10:26:33 +0000 |
| commit | e253fe14e3fd3b8e1c501ddc7fe8027f23f7b721 (patch) | |
| tree | f7a9d5b8cee92a181b16717a81ca984e87b1326f /www | |
| parent | - Remove always-true/false conditions after FreeBSD 9, 10.1, 10.2 EOL (diff) | |
- 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
Diffstat (limited to 'www')
| -rw-r--r-- | www/chromium/Makefile | 6 | ||||
| -rw-r--r-- | www/chromium/files/extra-patch-libc++-new | 14 | ||||
| -rw-r--r-- | www/chromium/files/extra-patch-libc++-old | 14 |
3 files changed, 34 insertions, 0 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 491c69fb5874..7960be6371fe 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -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 diff --git a/www/chromium/files/extra-patch-libc++-new b/www/chromium/files/extra-patch-libc++-new new file mode 100644 index 000000000000..a62e8543187d --- /dev/null +++ b/www/chromium/files/extra-patch-libc++-new @@ -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", diff --git a/www/chromium/files/extra-patch-libc++-old b/www/chromium/files/extra-patch-libc++-old new file mode 100644 index 000000000000..2c00e5d85679 --- /dev/null +++ b/www/chromium/files/extra-patch-libc++-old @@ -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", |