View | Details | Raw Unified | Return to bug 214654
Collapse All | Expand All

(-)www/chromium/Makefile (-1 / +8 lines)
Lines 93-99 Link Here
93
		use_system_sqlite=false   # chrome has additional patches
93
		use_system_sqlite=false   # chrome has additional patches
94
# TODO: investigate building with these options:
94
# TODO: investigate building with these options:
95
# use_system_icu use_system_harfbuzz use_system_minigbm
95
# use_system_icu use_system_harfbuzz use_system_minigbm
96
GN_BOOTSTRAP_FLAGS=	--no-clean --no-rebuild
96
GN_BOOTSTRAP_FLAGS=	--no-clean --no-rebuild -v
97
97
98
# FreeBSD Chromium Api Key
98
# FreeBSD Chromium Api Key
99
# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
99
# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
Lines 187-193 Link Here
187
		CPLUS_INCLUDE_PATH=${LOCALBASE}/include
187
		CPLUS_INCLUDE_PATH=${LOCALBASE}/include
188
GN_ARGS+=	is_clang=true
188
GN_ARGS+=	is_clang=true
189
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clang
189
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clang
190
.if ${OSVERSION} < 1200017
191
.warning Using _LIBCPP_TRIVIAL_PAIR_COPY_CTOR
192
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libc++-old
193
.else
194
.warning Using _LIBCPP_ABI_UNSTABLE
195
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libc++-new
190
.endif
196
.endif
197
.endif
191
198
192
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1002000
199
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1002000
193
BUILD_DEPENDS+=	${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++
200
BUILD_DEPENDS+=	${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++
(-)www/chromium/files/extra-patch-libc++-new (+14 lines)
Line 0 Link Here
1
--- services/ui/ws/BUILD.gn.orig	2016-10-06 04:02:24.000000000 +0300
2
+++ services/ui/ws/BUILD.gn	2016-10-19 11:13:25.102806000 +0300
3
@@ -103,6 +103,11 @@
4
     "window_tree_host_factory.h",
5
   ]
6
 
7
+  # Work around base r261801
8
+  if (is_bsd) {
9
+    defines = ["_LIBCPP_ABI_UNSTABLE=1"]
10
+  }
11
+
12
   deps = [
13
     # TODO(sad): Temporary, until the GPU process is split out of ws.
14
     "//services/ui/gpu",
(-)www/chromium/files/extra-patch-libc++-old (+14 lines)
Line 0 Link Here
1
--- services/ui/ws/BUILD.gn.orig	2016-10-06 04:02:24.000000000 +0300
2
+++ services/ui/ws/BUILD.gn	2016-10-19 11:13:25.102806000 +0300
3
@@ -103,6 +103,11 @@
4
     "window_tree_host_factory.h",
5
   ]
6
 
7
+  # Work around base r261801
8
+  if (is_bsd) {
9
+    defines = ["_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1"]
10
+  }
11
+
12
   deps = [
13
     # TODO(sad): Temporary, until the GPU process is split out of ws.
14
     "//services/ui/gpu",
(-)www/chromium/files/patch-services_ui_ws_BUILD.gn (-14 lines)
Lines 1-14 Link Here
1
--- services/ui/ws/BUILD.gn.orig	2016-10-06 04:02:24.000000000 +0300
2
+++ services/ui/ws/BUILD.gn	2016-10-19 11:13:25.102806000 +0300
3
@@ -103,6 +103,11 @@
4
     "window_tree_host_factory.h",
5
   ]
6
 
7
+  # Work around base r261801
8
+  if (is_bsd) {
9
+    defines = ["_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1"]
10
+  }
11
+
12
   deps = [
13
     # TODO(sad): Temporary, until the GPU process is split out of ws.
14
     "//services/ui/gpu",

Return to bug 214654