1 |
commit: 5b2f7120e58504ed523aca3ff382d55a5e24e8f5 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 29 19:35:46 2018 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 29 19:36:07 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b2f7120 |
7 |
|
8 |
www-client/chromium: dev channel bump (68.0.3438.3) |
9 |
|
10 |
Package-Manager: Portage-2.3.40_p8, Repoman-2.3.9_p240 |
11 |
|
12 |
www-client/chromium/Manifest | 1 + |
13 |
www-client/chromium/chromium-68.0.3438.3.ebuild | 696 +++++++++++++++++++++ |
14 |
.../chromium/files/chromium-compiler-r2.patch | 168 +++++ |
15 |
.../chromium/files/chromium-gn-bootstrap-r24.patch | 31 + |
16 |
4 files changed, 896 insertions(+) |
17 |
|
18 |
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest |
19 |
index 0ed6fefab6d..6b551df3a31 100644 |
20 |
--- a/www-client/chromium/Manifest |
21 |
+++ b/www-client/chromium/Manifest |
22 |
@@ -3,3 +3,4 @@ DIST chromium-66.0.3359.181.tar.xz 583985908 BLAKE2B 22794b379591da9e4bfb1ea38ae |
23 |
DIST chromium-67.0.3396.40.tar.xz 589878296 BLAKE2B e02d8980cb882fb67eb6e048dfa8534fb423259af257040cdda8198aac9433a221d6218873a8e5623ae3cfb8e081f22bfc40444e53be38b17a0ebff77537263d SHA512 1d4986d444076a4a48bf9ad7061dbb424f520e46f2f58f8f84dfee2fefea05a3b019ef27acda553efb9a75db9731acbc0c80f5dfb39a9137e9e27336306d5981 |
24 |
DIST chromium-67.0.3396.56.tar.xz 589901992 BLAKE2B e5207de67db589d65dbaf7af493308a60e3951993f439218c025d10fecd331052a3dfd0f196f3c7e078cda79af3d248a94550a6ffb8c0da7842592e48de20313 SHA512 a7397ebcff54e184ad510fcc7d7958a4adafcf53c88a7ad951fc361366439b01c4e1a77dfcfadbf1f96d92e9ea503287862e7cd2521be696919cf3ee0f1d0816 |
25 |
DIST chromium-68.0.3409.2.tar.xz 595647380 BLAKE2B 3f3ebb7de759ae92b8feca74a931c10c4bdf4f75a0a7aeb2f56b59e635e1f03becccdf2b26d306e5753d9379eadede6ef50ec4e44338a3a6bdfb960b74003770 SHA512 2ce35251392570bcfe0cc02813bf6cee1761b2227888a135491828bfdfa9eafa4538e8fb981165503f901eecbf91cc8ce17cebab1681c63a43f0625dae7a2dd8 |
26 |
+DIST chromium-68.0.3438.3.tar.xz 624448788 BLAKE2B 25e8f6bfc9171f17a634caa8974a01dba8e0b40dba78534f8b04cbced98566ce8addba65907165599587d0120563073f051af2af19601e4556182b9ec5442113 SHA512 2ff17270acee971bf9a2770b826f919979f24ab7be12a00504ad0b16e72f21fd70f7dc543e8823f8c1737ff785ae900e999d2e82153ff84d0b33cf68ad82a2a2 |
27 |
|
28 |
diff --git a/www-client/chromium/chromium-68.0.3438.3.ebuild b/www-client/chromium/chromium-68.0.3438.3.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..2022782559c |
31 |
--- /dev/null |
32 |
+++ b/www-client/chromium/chromium-68.0.3438.3.ebuild |
33 |
@@ -0,0 +1,696 @@ |
34 |
+# Copyright 1999-2018 Gentoo Foundation |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI="6" |
38 |
+PYTHON_COMPAT=( python2_7 ) |
39 |
+ |
40 |
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he |
41 |
+ hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr |
42 |
+ sv sw ta te th tr uk vi zh-CN zh-TW" |
43 |
+ |
44 |
+inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils |
45 |
+ |
46 |
+DESCRIPTION="Open-source version of Google Chrome web browser" |
47 |
+HOMEPAGE="http://chromium.org/" |
48 |
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz" |
49 |
+ |
50 |
+LICENSE="BSD" |
51 |
+SLOT="0" |
52 |
+KEYWORDS="~amd64 ~arm64 ~x86" |
53 |
+IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine" |
54 |
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" |
55 |
+ |
56 |
+COMMON_DEPEND=" |
57 |
+ app-accessibility/at-spi2-atk:2 |
58 |
+ app-arch/bzip2:= |
59 |
+ cups? ( >=net-print/cups-1.3.11:= ) |
60 |
+ dev-libs/atk |
61 |
+ dev-libs/expat:= |
62 |
+ dev-libs/glib:2 |
63 |
+ system-icu? ( >=dev-libs/icu-59:= ) |
64 |
+ >=dev-libs/libxml2-2.9.4-r3:=[icu] |
65 |
+ dev-libs/libxslt:= |
66 |
+ dev-libs/nspr:= |
67 |
+ >=dev-libs/nss-3.26:= |
68 |
+ >=dev-libs/re2-0.2016.05.01:= |
69 |
+ gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) |
70 |
+ >=media-libs/alsa-lib-1.0.19:= |
71 |
+ media-libs/fontconfig:= |
72 |
+ media-libs/freetype:= |
73 |
+ >=media-libs/harfbuzz-1.6.0:=[icu(-)] |
74 |
+ media-libs/libjpeg-turbo:= |
75 |
+ media-libs/libpng:= |
76 |
+ system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) |
77 |
+ >=media-libs/openh264-1.6.0:= |
78 |
+ pulseaudio? ( media-sound/pulseaudio:= ) |
79 |
+ system-ffmpeg? ( |
80 |
+ >=media-video/ffmpeg-4:= |
81 |
+ || ( |
82 |
+ media-video/ffmpeg[-samba] |
83 |
+ >=net-fs/samba-4.5.10-r1[-debug(-)] |
84 |
+ ) |
85 |
+ !=net-fs/samba-4.5.12 |
86 |
+ media-libs/opus:= |
87 |
+ ) |
88 |
+ sys-apps/dbus:= |
89 |
+ sys-apps/pciutils:= |
90 |
+ virtual/udev |
91 |
+ x11-libs/cairo:= |
92 |
+ x11-libs/gdk-pixbuf:2 |
93 |
+ x11-libs/gtk+:3[X] |
94 |
+ x11-libs/libX11:= |
95 |
+ x11-libs/libXcomposite:= |
96 |
+ x11-libs/libXcursor:= |
97 |
+ x11-libs/libXdamage:= |
98 |
+ x11-libs/libXext:= |
99 |
+ x11-libs/libXfixes:= |
100 |
+ >=x11-libs/libXi-1.6.0:= |
101 |
+ x11-libs/libXrandr:= |
102 |
+ x11-libs/libXrender:= |
103 |
+ x11-libs/libXScrnSaver:= |
104 |
+ x11-libs/libXtst:= |
105 |
+ x11-libs/pango:= |
106 |
+ app-arch/snappy:= |
107 |
+ media-libs/flac:= |
108 |
+ >=media-libs/libwebp-0.4.0:= |
109 |
+ sys-libs/zlib:=[minizip] |
110 |
+ kerberos? ( virtual/krb5 ) |
111 |
+" |
112 |
+# For nvidia-drivers blocker, see bug #413637 . |
113 |
+RDEPEND="${COMMON_DEPEND} |
114 |
+ !=www-client/chromium-9999 |
115 |
+ !<www-plugins/chrome-binary-plugins-57 |
116 |
+ x11-misc/xdg-utils |
117 |
+ virtual/opengl |
118 |
+ virtual/ttf-fonts |
119 |
+ selinux? ( sec-policy/selinux-chromium ) |
120 |
+ tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) |
121 |
+ widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] ) |
122 |
+" |
123 |
+# dev-vcs/git - https://bugs.gentoo.org/593476 |
124 |
+# sys-apps/sandbox - https://crbug.com/586444 |
125 |
+DEPEND="${COMMON_DEPEND} |
126 |
+ >=app-arch/gzip-1.7 |
127 |
+ !arm? ( |
128 |
+ dev-lang/yasm |
129 |
+ ) |
130 |
+ dev-lang/perl |
131 |
+ >=dev-util/gperf-3.0.3 |
132 |
+ >=dev-util/ninja-1.7.2 |
133 |
+ >=net-libs/nodejs-6.9.4 |
134 |
+ sys-apps/hwids[usb(+)] |
135 |
+ >=sys-devel/bison-2.4.3 |
136 |
+ sys-devel/flex |
137 |
+ >=sys-devel/clang-5 |
138 |
+ virtual/pkgconfig |
139 |
+ dev-vcs/git |
140 |
+ $(python_gen_any_dep ' |
141 |
+ dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}] |
142 |
+ >=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}] |
143 |
+ dev-python/html5lib[${PYTHON_USEDEP}] |
144 |
+ dev-python/simplejson[${PYTHON_USEDEP}] |
145 |
+ ') |
146 |
+" |
147 |
+ |
148 |
+# Keep this in sync with the python_gen_any_dep call. |
149 |
+python_check_deps() { |
150 |
+ has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && |
151 |
+ has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" && |
152 |
+ has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" && |
153 |
+ has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]" |
154 |
+} |
155 |
+ |
156 |
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then |
157 |
+ EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; |
158 |
+fi |
159 |
+ |
160 |
+DISABLE_AUTOFORMATTING="yes" |
161 |
+DOC_CONTENTS=" |
162 |
+Some web pages may require additional fonts to display properly. |
163 |
+Try installing some of the following packages if some characters |
164 |
+are not displayed properly: |
165 |
+- media-fonts/arphicfonts |
166 |
+- media-fonts/droid |
167 |
+- media-fonts/ipamonafont |
168 |
+- media-fonts/noto |
169 |
+- media-fonts/ja-ipafonts |
170 |
+- media-fonts/takao-fonts |
171 |
+- media-fonts/wqy-microhei |
172 |
+- media-fonts/wqy-zenhei |
173 |
+ |
174 |
+To fix broken icons on the Downloads page, you should install an icon |
175 |
+theme that covers the appropriate MIME types, and configure this as your |
176 |
+GTK+ icon theme. |
177 |
+" |
178 |
+ |
179 |
+PATCHES=( |
180 |
+ "${FILESDIR}/chromium-widevine-r2.patch" |
181 |
+ "${FILESDIR}/chromium-compiler-r2.patch" |
182 |
+ #"${FILESDIR}/chromium-ffmpeg-build-r0.patch" |
183 |
+ "${FILESDIR}/chromium-webrtc-r0.patch" |
184 |
+ "${FILESDIR}/chromium-memcpy-r0.patch" |
185 |
+ "${FILESDIR}/chromium-math.h-r0.patch" |
186 |
+ "${FILESDIR}/chromium-stdint.patch" |
187 |
+ "${FILESDIR}/chromium-ffmpeg-r1.patch" |
188 |
+ "${FILESDIR}/chromium-gn-bootstrap-r24.patch" |
189 |
+) |
190 |
+ |
191 |
+pre_build_checks() { |
192 |
+ #if [[ ${MERGE_TYPE} != binary ]]; then |
193 |
+ # local -x CPP="$(tc-getCXX) -E" |
194 |
+ # if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then |
195 |
+ # # bugs: #601654 |
196 |
+ # die "At least clang 3.9.1 is required" |
197 |
+ # fi |
198 |
+ # if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then |
199 |
+ # # bugs: #535730, #525374, #518668, #600288, #627356 |
200 |
+ # die "At least gcc 5.0 is required" |
201 |
+ # fi |
202 |
+ #fi |
203 |
+ |
204 |
+ # Check build requirements, bug #541816 and bug #471810 . |
205 |
+ CHECKREQS_MEMORY="3G" |
206 |
+ CHECKREQS_DISK_BUILD="5G" |
207 |
+ eshopts_push -s extglob |
208 |
+ if is-flagq '-g?(gdb)?([1-9])'; then |
209 |
+ CHECKREQS_DISK_BUILD="25G" |
210 |
+ if ! use component-build; then |
211 |
+ CHECKREQS_MEMORY="16G" |
212 |
+ fi |
213 |
+ fi |
214 |
+ eshopts_pop |
215 |
+ check-reqs_pkg_setup |
216 |
+} |
217 |
+ |
218 |
+pkg_pretend() { |
219 |
+ pre_build_checks |
220 |
+} |
221 |
+ |
222 |
+pkg_setup() { |
223 |
+ pre_build_checks |
224 |
+ |
225 |
+ chromium_suid_sandbox_check_kernel_config |
226 |
+} |
227 |
+ |
228 |
+src_prepare() { |
229 |
+ # Calling this here supports resumption via FEATURES=keepwork |
230 |
+ python_setup |
231 |
+ |
232 |
+ default |
233 |
+ |
234 |
+ mkdir -p third_party/node/linux/node-linux-x64/bin || die |
235 |
+ ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die |
236 |
+ |
237 |
+ local keeplibs=( |
238 |
+ base/third_party/dmg_fp |
239 |
+ base/third_party/dynamic_annotations |
240 |
+ base/third_party/icu |
241 |
+ base/third_party/nspr |
242 |
+ base/third_party/superfasthash |
243 |
+ base/third_party/symbolize |
244 |
+ base/third_party/valgrind |
245 |
+ base/third_party/xdg_mime |
246 |
+ base/third_party/xdg_user_dirs |
247 |
+ buildtools/third_party/libc++ |
248 |
+ buildtools/third_party/libc++abi |
249 |
+ chrome/third_party/mozilla_security_manager |
250 |
+ courgette/third_party |
251 |
+ net/third_party/http2 |
252 |
+ net/third_party/mozilla_security_manager |
253 |
+ net/third_party/nss |
254 |
+ net/third_party/quic |
255 |
+ net/third_party/spdy |
256 |
+ third_party/WebKit |
257 |
+ third_party/analytics |
258 |
+ third_party/angle |
259 |
+ third_party/angle/src/common/third_party/base |
260 |
+ third_party/angle/src/common/third_party/smhasher |
261 |
+ third_party/angle/src/third_party/compiler |
262 |
+ third_party/angle/src/third_party/libXNVCtrl |
263 |
+ third_party/angle/src/third_party/trace_event |
264 |
+ third_party/angle/third_party/glslang |
265 |
+ third_party/angle/third_party/spirv-headers |
266 |
+ third_party/angle/third_party/spirv-tools |
267 |
+ third_party/angle/third_party/vulkan-validation-layers |
268 |
+ third_party/apple_apsl |
269 |
+ third_party/blink |
270 |
+ third_party/boringssl |
271 |
+ third_party/boringssl/src/third_party/fiat |
272 |
+ third_party/breakpad |
273 |
+ third_party/breakpad/breakpad/src/third_party/curl |
274 |
+ third_party/brotli |
275 |
+ third_party/cacheinvalidation |
276 |
+ third_party/catapult |
277 |
+ third_party/catapult/common/py_vulcanize/third_party/rcssmin |
278 |
+ third_party/catapult/common/py_vulcanize/third_party/rjsmin |
279 |
+ third_party/catapult/third_party/polymer |
280 |
+ third_party/catapult/tracing/third_party/d3 |
281 |
+ third_party/catapult/tracing/third_party/gl-matrix |
282 |
+ third_party/catapult/tracing/third_party/jszip |
283 |
+ third_party/catapult/tracing/third_party/mannwhitneyu |
284 |
+ third_party/catapult/tracing/third_party/oboe |
285 |
+ third_party/catapult/tracing/third_party/pako |
286 |
+ third_party/ced |
287 |
+ third_party/cld_3 |
288 |
+ third_party/crashpad |
289 |
+ third_party/crashpad/crashpad/third_party/zlib |
290 |
+ third_party/crc32c |
291 |
+ third_party/cros_system_api |
292 |
+ third_party/devscripts |
293 |
+ third_party/dom_distiller_js |
294 |
+ third_party/fips181 |
295 |
+ third_party/flatbuffers |
296 |
+ third_party/flot |
297 |
+ third_party/freetype |
298 |
+ third_party/glslang-angle |
299 |
+ third_party/google_input_tools |
300 |
+ third_party/google_input_tools/third_party/closure_library |
301 |
+ third_party/google_input_tools/third_party/closure_library/third_party/closure |
302 |
+ third_party/googletest |
303 |
+ third_party/hunspell |
304 |
+ third_party/iccjpeg |
305 |
+ third_party/inspector_protocol |
306 |
+ third_party/jinja2 |
307 |
+ third_party/jstemplate |
308 |
+ third_party/khronos |
309 |
+ third_party/leveldatabase |
310 |
+ third_party/libXNVCtrl |
311 |
+ third_party/libaddressinput |
312 |
+ third_party/libaom |
313 |
+ third_party/libaom/source/libaom/third_party/x86inc |
314 |
+ third_party/libjingle |
315 |
+ third_party/libphonenumber |
316 |
+ third_party/libsecret |
317 |
+ third_party/libsrtp |
318 |
+ third_party/libsync |
319 |
+ third_party/libudev |
320 |
+ third_party/libwebm |
321 |
+ third_party/libxml/chromium |
322 |
+ third_party/libyuv |
323 |
+ third_party/llvm |
324 |
+ third_party/lss |
325 |
+ third_party/lzma_sdk |
326 |
+ third_party/markupsafe |
327 |
+ third_party/mesa |
328 |
+ third_party/metrics_proto |
329 |
+ third_party/modp_b64 |
330 |
+ third_party/node |
331 |
+ third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2 |
332 |
+ third_party/openmax_dl |
333 |
+ third_party/ots |
334 |
+ third_party/pdfium |
335 |
+ third_party/pdfium/third_party/agg23 |
336 |
+ third_party/pdfium/third_party/base |
337 |
+ third_party/pdfium/third_party/bigint |
338 |
+ third_party/pdfium/third_party/freetype |
339 |
+ third_party/pdfium/third_party/lcms |
340 |
+ third_party/pdfium/third_party/libopenjpeg20 |
341 |
+ third_party/pdfium/third_party/libpng16 |
342 |
+ third_party/pdfium/third_party/libtiff |
343 |
+ third_party/pdfium/third_party/skia_shared |
344 |
+ third_party/perfetto |
345 |
+ third_party/ply |
346 |
+ third_party/polymer |
347 |
+ third_party/protobuf |
348 |
+ third_party/protobuf/third_party/six |
349 |
+ third_party/pyjson5 |
350 |
+ third_party/qcms |
351 |
+ third_party/rnnoise |
352 |
+ third_party/s2cellid |
353 |
+ third_party/sfntly |
354 |
+ third_party/skia |
355 |
+ third_party/skia/third_party/gif |
356 |
+ third_party/skia/third_party/skcms |
357 |
+ third_party/skia/third_party/vulkan |
358 |
+ third_party/smhasher |
359 |
+ third_party/spirv-headers |
360 |
+ third_party/spirv-tools-angle |
361 |
+ third_party/sqlite |
362 |
+ third_party/swiftshader |
363 |
+ third_party/swiftshader/third_party/llvm-subzero |
364 |
+ third_party/swiftshader/third_party/subzero |
365 |
+ third_party/unrar |
366 |
+ third_party/usrsctp |
367 |
+ third_party/vulkan |
368 |
+ third_party/vulkan-validation-layers |
369 |
+ third_party/web-animations-js |
370 |
+ third_party/webdriver |
371 |
+ third_party/webrtc |
372 |
+ third_party/widevine |
373 |
+ third_party/woff2 |
374 |
+ third_party/zlib/google |
375 |
+ url/third_party/mozilla |
376 |
+ v8/src/third_party/valgrind |
377 |
+ v8/src/third_party/utf8-decoder |
378 |
+ v8/third_party/antlr4 |
379 |
+ v8/third_party/inspector_protocol |
380 |
+ |
381 |
+ # gyp -> gn leftovers |
382 |
+ base/third_party/libevent |
383 |
+ third_party/adobe |
384 |
+ third_party/speech-dispatcher |
385 |
+ third_party/usb_ids |
386 |
+ third_party/xdg-utils |
387 |
+ third_party/yasm/run_yasm.py |
388 |
+ ) |
389 |
+ if ! use system-ffmpeg; then |
390 |
+ keeplibs+=( third_party/ffmpeg third_party/opus ) |
391 |
+ fi |
392 |
+ if ! use system-icu; then |
393 |
+ keeplibs+=( third_party/icu ) |
394 |
+ fi |
395 |
+ if ! use system-libvpx; then |
396 |
+ keeplibs+=( third_party/libvpx ) |
397 |
+ keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc ) |
398 |
+ fi |
399 |
+ if use tcmalloc; then |
400 |
+ keeplibs+=( third_party/tcmalloc ) |
401 |
+ fi |
402 |
+ |
403 |
+ # Remove most bundled libraries. Some are still needed. |
404 |
+ build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die |
405 |
+} |
406 |
+ |
407 |
+bootstrap_gn() { |
408 |
+ if tc-is-cross-compiler; then |
409 |
+ local -x AR=${BUILD_AR} |
410 |
+ local -x CC=${BUILD_CC} |
411 |
+ local -x CXX=${BUILD_CXX} |
412 |
+ local -x NM=${BUILD_NM} |
413 |
+ local -x CFLAGS=${BUILD_CFLAGS} |
414 |
+ local -x CXXFLAGS=${BUILD_CXXFLAGS} |
415 |
+ local -x LDFLAGS=${BUILD_LDFLAGS} |
416 |
+ fi |
417 |
+ einfo "Building GN..." |
418 |
+ set -- tools/gn/bootstrap/bootstrap.py -s -v --no-clean |
419 |
+ echo "$@" |
420 |
+ "$@" || die |
421 |
+} |
422 |
+ |
423 |
+src_configure() { |
424 |
+ # Calling this here supports resumption via FEATURES=keepwork |
425 |
+ python_setup |
426 |
+ |
427 |
+ local myconf_gn="" |
428 |
+ |
429 |
+ # Make sure the build system will use the right tools, bug #340795. |
430 |
+ tc-export AR CC CXX NM |
431 |
+ |
432 |
+ if ! tc-is-clang; then |
433 |
+ # Force clang since gcc is pretty broken at the moment. |
434 |
+ CC=${CHOST}-clang |
435 |
+ CXX=${CHOST}-clang++ |
436 |
+ strip-unsupported-flags |
437 |
+ fi |
438 |
+ |
439 |
+ if tc-is-clang; then |
440 |
+ myconf_gn+=" is_clang=true clang_use_chrome_plugins=false" |
441 |
+ else |
442 |
+ myconf_gn+=" is_clang=false" |
443 |
+ fi |
444 |
+ |
445 |
+ # Define a custom toolchain for GN |
446 |
+ myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\"" |
447 |
+ |
448 |
+ if tc-is-cross-compiler; then |
449 |
+ tc-export BUILD_{AR,CC,CXX,NM} |
450 |
+ myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\"" |
451 |
+ myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\"" |
452 |
+ else |
453 |
+ myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\"" |
454 |
+ fi |
455 |
+ |
456 |
+ # GN needs explicit config for Debug/Release as opposed to inferring it from build directory. |
457 |
+ myconf_gn+=" is_debug=false" |
458 |
+ |
459 |
+ # Component build isn't generally intended for use by end users. It's mostly useful |
460 |
+ # for development and debugging. |
461 |
+ myconf_gn+=" is_component_build=$(usex component-build true false)" |
462 |
+ |
463 |
+ # https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md |
464 |
+ myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)" |
465 |
+ |
466 |
+ myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")" |
467 |
+ |
468 |
+ # Disable nacl, we can't build without pnacl (http://crbug.com/269560). |
469 |
+ myconf_gn+=" enable_nacl=false" |
470 |
+ |
471 |
+ # Use system-provided libraries. |
472 |
+ # TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733). |
473 |
+ # TODO: use_system_hunspell (upstream changes needed). |
474 |
+ # TODO: use_system_libsrtp (bug #459932). |
475 |
+ # TODO: use_system_protobuf (bug #525560). |
476 |
+ # TODO: use_system_ssl (http://crbug.com/58087). |
477 |
+ # TODO: use_system_sqlite (http://crbug.com/22208). |
478 |
+ |
479 |
+ # libevent: https://bugs.gentoo.org/593458 |
480 |
+ local gn_system_libraries=( |
481 |
+ flac |
482 |
+ fontconfig |
483 |
+ freetype |
484 |
+ # Need harfbuzz_from_pkgconfig target |
485 |
+ #harfbuzz-ng |
486 |
+ libdrm |
487 |
+ libjpeg |
488 |
+ libpng |
489 |
+ libwebp |
490 |
+ libxml |
491 |
+ libxslt |
492 |
+ openh264 |
493 |
+ re2 |
494 |
+ snappy |
495 |
+ yasm |
496 |
+ zlib |
497 |
+ ) |
498 |
+ if use system-ffmpeg; then |
499 |
+ gn_system_libraries+=( ffmpeg opus ) |
500 |
+ fi |
501 |
+ if use system-icu; then |
502 |
+ gn_system_libraries+=( icu ) |
503 |
+ fi |
504 |
+ if use system-libvpx; then |
505 |
+ gn_system_libraries+=( libvpx ) |
506 |
+ fi |
507 |
+ build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die |
508 |
+ |
509 |
+ # See dependency logic in third_party/BUILD.gn |
510 |
+ myconf_gn+=" use_system_harfbuzz=true" |
511 |
+ |
512 |
+ # Optional dependencies. |
513 |
+ myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)" |
514 |
+ myconf_gn+=" enable_widevine=$(usex widevine true false)" |
515 |
+ myconf_gn+=" use_cups=$(usex cups true false)" |
516 |
+ myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)" |
517 |
+ myconf_gn+=" use_kerberos=$(usex kerberos true false)" |
518 |
+ myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)" |
519 |
+ |
520 |
+ # TODO: link_pulseaudio=true for GN. |
521 |
+ |
522 |
+ myconf_gn+=" fieldtrial_testing_like_official_build=true" |
523 |
+ |
524 |
+ # Never use bundled gold binary. Disable gold linker flags for now. |
525 |
+ # Do not use bundled clang. |
526 |
+ # Trying to use gold results in linker crash. |
527 |
+ myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false" |
528 |
+ |
529 |
+ # Disable forced lld, bug 641556 |
530 |
+ myconf_gn+=" use_lld=false" |
531 |
+ |
532 |
+ ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" |
533 |
+ myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)" |
534 |
+ myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\"" |
535 |
+ |
536 |
+ # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . |
537 |
+ # Note: these are for Gentoo use ONLY. For your own distribution, |
538 |
+ # please get your own set of keys. Feel free to contact chromium@g.o |
539 |
+ # for more info. |
540 |
+ local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc" |
541 |
+ local google_default_client_id="329227923882.apps.googleusercontent.com" |
542 |
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" |
543 |
+ myconf_gn+=" google_api_key=\"${google_api_key}\"" |
544 |
+ myconf_gn+=" google_default_client_id=\"${google_default_client_id}\"" |
545 |
+ myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\"" |
546 |
+ |
547 |
+ local myarch="$(tc-arch)" |
548 |
+ if [[ $myarch = amd64 ]] ; then |
549 |
+ myconf_gn+=" target_cpu=\"x64\"" |
550 |
+ ffmpeg_target_arch=x64 |
551 |
+ elif [[ $myarch = x86 ]] ; then |
552 |
+ myconf_gn+=" target_cpu=\"x86\"" |
553 |
+ ffmpeg_target_arch=ia32 |
554 |
+ elif [[ $myarch = arm64 ]] ; then |
555 |
+ myconf_gn+=" target_cpu=\"arm64\"" |
556 |
+ ffmpeg_target_arch=arm64 |
557 |
+ elif [[ $myarch = arm ]] ; then |
558 |
+ myconf_gn+=" target_cpu=\"arm\"" |
559 |
+ ffmpeg_target_arch=$(usex neon arm-neon arm) |
560 |
+ else |
561 |
+ die "Failed to determine target arch, got '$myarch'." |
562 |
+ fi |
563 |
+ |
564 |
+ # Make sure that -Werror doesn't get added to CFLAGS by the build system. |
565 |
+ # Depending on GCC version the warnings are different and we don't want |
566 |
+ # the build to fail because of that. |
567 |
+ myconf_gn+=" treat_warnings_as_errors=false" |
568 |
+ |
569 |
+ # Disable fatal linker warnings, bug 506268. |
570 |
+ myconf_gn+=" fatal_linker_warnings=false" |
571 |
+ |
572 |
+ # Avoid CFLAGS problems, bug #352457, bug #390147. |
573 |
+ if ! use custom-cflags; then |
574 |
+ replace-flags "-Os" "-O2" |
575 |
+ strip-flags |
576 |
+ |
577 |
+ # Prevent linker from running out of address space, bug #471810 . |
578 |
+ if use x86; then |
579 |
+ filter-flags "-g*" |
580 |
+ fi |
581 |
+ |
582 |
+ # Prevent libvpx build failures. Bug 530248, 544702, 546984. |
583 |
+ if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then |
584 |
+ filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 |
585 |
+ fi |
586 |
+ fi |
587 |
+ |
588 |
+ # https://bugs.gentoo.org/588596 |
589 |
+ #append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks) |
590 |
+ |
591 |
+ # Bug 491582. |
592 |
+ export TMPDIR="${WORKDIR}/temp" |
593 |
+ mkdir -p -m 755 "${TMPDIR}" || die |
594 |
+ |
595 |
+ # https://bugs.gentoo.org/654216 |
596 |
+ addpredict /dev/dri/ |
597 |
+ |
598 |
+ #if ! use system-ffmpeg; then |
599 |
+ if false; then |
600 |
+ local build_ffmpeg_args="" |
601 |
+ if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then |
602 |
+ build_ffmpeg_args+=" --disable-asm" |
603 |
+ fi |
604 |
+ |
605 |
+ # Re-configure bundled ffmpeg. See bug #491378 for example reasons. |
606 |
+ einfo "Configuring bundled ffmpeg..." |
607 |
+ pushd third_party/ffmpeg > /dev/null || die |
608 |
+ chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \ |
609 |
+ --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die |
610 |
+ chromium/scripts/copy_config.sh || die |
611 |
+ chromium/scripts/generate_gn.py || die |
612 |
+ popd > /dev/null || die |
613 |
+ fi |
614 |
+ |
615 |
+ bootstrap_gn |
616 |
+ |
617 |
+ einfo "Configuring Chromium..." |
618 |
+ set -- out/Release/gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release |
619 |
+ echo "$@" |
620 |
+ "$@" || die |
621 |
+} |
622 |
+ |
623 |
+src_compile() { |
624 |
+ # Calling this here supports resumption via FEATURES=keepwork |
625 |
+ python_setup |
626 |
+ |
627 |
+ #"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die |
628 |
+ |
629 |
+ # Even though ninja autodetects number of CPUs, we respect |
630 |
+ # user's options, for debugging with -j 1 or any other reason. |
631 |
+ eninja -C out/Release chrome chromedriver |
632 |
+ use suid && eninja -C out/Release chrome_sandbox |
633 |
+ |
634 |
+ pax-mark m out/Release/chrome |
635 |
+} |
636 |
+ |
637 |
+src_install() { |
638 |
+ local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser" |
639 |
+ exeinto "${CHROMIUM_HOME}" |
640 |
+ doexe out/Release/chrome |
641 |
+ |
642 |
+ if use suid; then |
643 |
+ newexe out/Release/chrome_sandbox chrome-sandbox |
644 |
+ fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox" |
645 |
+ fi |
646 |
+ |
647 |
+ doexe out/Release/chromedriver |
648 |
+ |
649 |
+ local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" ) |
650 |
+ sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die |
651 |
+ doexe chromium-launcher.sh |
652 |
+ |
653 |
+ # It is important that we name the target "chromium-browser", |
654 |
+ # xdg-utils expect it; bug #355517. |
655 |
+ dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser |
656 |
+ # keep the old symlink around for consistency |
657 |
+ dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium |
658 |
+ |
659 |
+ dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver |
660 |
+ |
661 |
+ # Allow users to override command-line options, bug #357629. |
662 |
+ insinto /etc/chromium |
663 |
+ newins "${FILESDIR}/chromium.default" "default" |
664 |
+ |
665 |
+ pushd out/Release/locales > /dev/null || die |
666 |
+ chromium_remove_language_paks |
667 |
+ popd |
668 |
+ |
669 |
+ insinto "${CHROMIUM_HOME}" |
670 |
+ doins out/Release/*.bin |
671 |
+ doins out/Release/*.pak |
672 |
+ doins out/Release/*.so |
673 |
+ |
674 |
+ if ! use system-icu; then |
675 |
+ doins out/Release/icudtl.dat |
676 |
+ fi |
677 |
+ |
678 |
+ doins -r out/Release/locales |
679 |
+ doins -r out/Release/resources |
680 |
+ |
681 |
+ if [[ -d out/Release/swiftshader ]]; then |
682 |
+ insinto "${CHROMIUM_HOME}/swiftshader" |
683 |
+ doins out/Release/swiftshader/*.so |
684 |
+ fi |
685 |
+ |
686 |
+ # Install icons and desktop entry. |
687 |
+ local branding size |
688 |
+ for size in 16 22 24 32 48 64 128 256 ; do |
689 |
+ case ${size} in |
690 |
+ 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;; |
691 |
+ *) branding="chrome/app/theme/chromium" ;; |
692 |
+ esac |
693 |
+ newicon -s ${size} "${branding}/product_logo_${size}.png" \ |
694 |
+ chromium-browser.png |
695 |
+ done |
696 |
+ |
697 |
+ local mime_types="text/html;text/xml;application/xhtml+xml;" |
698 |
+ mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 |
699 |
+ mime_types+="x-scheme-handler/ftp;" # bug #412185 |
700 |
+ mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393 |
701 |
+ make_desktop_entry \ |
702 |
+ chromium-browser \ |
703 |
+ "Chromium" \ |
704 |
+ chromium-browser \ |
705 |
+ "Network;WebBrowser" \ |
706 |
+ "MimeType=${mime_types}\nStartupWMClass=chromium-browser" |
707 |
+ sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die |
708 |
+ |
709 |
+ # Install GNOME default application entry (bug #303100). |
710 |
+ insinto /usr/share/gnome-control-center/default-apps |
711 |
+ newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml |
712 |
+ |
713 |
+ readme.gentoo_create_doc |
714 |
+} |
715 |
+ |
716 |
+pkg_preinst() { |
717 |
+ gnome2_icon_savelist |
718 |
+} |
719 |
+ |
720 |
+pkg_postrm() { |
721 |
+ gnome2_icon_cache_update |
722 |
+ xdg_desktop_database_update |
723 |
+} |
724 |
+ |
725 |
+pkg_postinst() { |
726 |
+ gnome2_icon_cache_update |
727 |
+ xdg_desktop_database_update |
728 |
+ readme.gentoo_print_elog |
729 |
+} |
730 |
|
731 |
diff --git a/www-client/chromium/files/chromium-compiler-r2.patch b/www-client/chromium/files/chromium-compiler-r2.patch |
732 |
new file mode 100644 |
733 |
index 00000000000..3ac2eb81f4c |
734 |
--- /dev/null |
735 |
+++ b/www-client/chromium/files/chromium-compiler-r2.patch |
736 |
@@ -0,0 +1,168 @@ |
737 |
+From 4310db462fab74bf14066f2a6f7cf250ecba0cf1 Mon Sep 17 00:00:00 2001 |
738 |
+From: Mike Gilbert <floppym@g.o> |
739 |
+Date: Wed, 25 Apr 2018 13:22:49 -0400 |
740 |
+Subject: [PATCH] Disable various compiler configs |
741 |
+ |
742 |
+--- |
743 |
+ build/config/compiler/BUILD.gn | 61 ++++++++++------------------------ |
744 |
+ 1 file changed, 18 insertions(+), 43 deletions(-) |
745 |
+ |
746 |
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn |
747 |
+index 83337d52e4b9..f2c192fc31ca 100644 |
748 |
+--- a/build/config/compiler/BUILD.gn |
749 |
++++ b/build/config/compiler/BUILD.gn |
750 |
+@@ -228,8 +228,6 @@ config("compiler") { |
751 |
+ |
752 |
+ configs += [ |
753 |
+ # See the definitions below. |
754 |
+- ":clang_revision", |
755 |
+- ":compiler_cpu_abi", |
756 |
+ ":compiler_codegen", |
757 |
+ ] |
758 |
+ |
759 |
+@@ -488,18 +486,6 @@ config("compiler") { |
760 |
+ } |
761 |
+ } |
762 |
+ |
763 |
+- if (is_clang && !is_nacl && current_toolchain == host_toolchain && |
764 |
+- target_os != "chromeos") { |
765 |
+- cflags += [ |
766 |
+- # TODO(hans): Remove this once Clang generates better optimized debug info |
767 |
+- # by default. https://crbug.com/765793 |
768 |
+- "-Xclang", |
769 |
+- "-mllvm", |
770 |
+- "-Xclang", |
771 |
+- "-instcombine-lower-dbg-declare=0", |
772 |
+- ] |
773 |
+- } |
774 |
+- |
775 |
+ # Print absolute paths in diagnostics. There is no precedent for doing this |
776 |
+ # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and |
777 |
+ # Windows developers rely on it (crbug.com/636109) so only do this on Windows. |
778 |
+@@ -1415,10 +1401,6 @@ config("default_warnings") { |
779 |
+ |
780 |
+ # TODO(hans): https://crbug.com/766891 |
781 |
+ "-Wno-null-pointer-arithmetic", |
782 |
+- |
783 |
+- # Ignore warnings about MSVC optimization pragmas. |
784 |
+- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314 |
785 |
+- "-Wno-ignored-pragma-optimize", |
786 |
+ ] |
787 |
+ } else if (use_xcode_clang) { |
788 |
+ cflags += [ |
789 |
+@@ -1462,22 +1444,6 @@ config("chromium_code") { |
790 |
+ "__STDC_FORMAT_MACROS", |
791 |
+ ] |
792 |
+ |
793 |
+- if (!is_debug && !using_sanitizer && |
794 |
+- (!is_linux || !is_clang || is_official_build) && |
795 |
+- current_cpu != "s390x" && current_cpu != "s390" && |
796 |
+- current_cpu != "ppc64" && current_cpu != "ppc64" && |
797 |
+- current_cpu != "mips" && current_cpu != "mips64") { |
798 |
+- # _FORTIFY_SOURCE isn't really supported by Clang now, see |
799 |
+- # http://llvm.org/bugs/show_bug.cgi?id=16821. |
800 |
+- # It seems to work fine with Ubuntu 12 headers though, so use it in |
801 |
+- # official builds. |
802 |
+- # |
803 |
+- # Non-chromium code is not guaranteed to compile cleanly with |
804 |
+- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are |
805 |
+- # disabled, so only do that for Release build. |
806 |
+- defines += [ "_FORTIFY_SOURCE=2" ] |
807 |
+- } |
808 |
+- |
809 |
+ if (is_mac || is_ios) { |
810 |
+ cflags_objc = [ "-Wobjc-missing-property-synthesis" ] |
811 |
+ cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] |
812 |
+@@ -1807,7 +1773,8 @@ config("default_stack_frames") { |
813 |
+ } |
814 |
+ |
815 |
+ # Default "optimization on" config. |
816 |
+-config("optimize") { |
817 |
++config("optimize") { } |
818 |
++config("xoptimize") { |
819 |
+ if (is_win) { |
820 |
+ # TODO(thakis): Remove is_clang here, https://crbug.com/598772 |
821 |
+ if (is_official_build && full_wpo_on_official && !is_clang) { |
822 |
+@@ -1841,7 +1808,8 @@ config("optimize") { |
823 |
+ } |
824 |
+ |
825 |
+ # Same config as 'optimize' but without the WPO flag. |
826 |
+-config("optimize_no_wpo") { |
827 |
++config("optimize_no_wpo") { } |
828 |
++config("xoptimize_no_wpo") { |
829 |
+ if (is_win) { |
830 |
+ # Favor size over speed, /O1 must be before the common flags. The GYP |
831 |
+ # build also specifies /Os and /GF but these are implied by /O1. |
832 |
+@@ -1864,7 +1832,8 @@ config("optimize_no_wpo") { |
833 |
+ } |
834 |
+ |
835 |
+ # Turn off optimizations. |
836 |
+-config("no_optimize") { |
837 |
++config("no_optimize") { } |
838 |
++config("xno_optimize") { |
839 |
+ if (is_win) { |
840 |
+ cflags = [ |
841 |
+ "/Od", # Disable optimization. |
842 |
+@@ -1888,7 +1857,8 @@ config("no_optimize") { |
843 |
+ # Turns up the optimization level. On Windows, this implies whole program |
844 |
+ # optimization and link-time code generation which is very expensive and should |
845 |
+ # be used sparingly. |
846 |
+-config("optimize_max") { |
847 |
++config("optimize_max") { } |
848 |
++config("xoptimize_max") { |
849 |
+ if (is_nacl && is_nacl_irt) { |
850 |
+ # The NaCl IRT is a special case and always wants its own config. |
851 |
+ # Various components do: |
852 |
+@@ -1935,7 +1905,8 @@ config("optimize_max") { |
853 |
+ # |
854 |
+ # TODO(crbug.com/621335) - rework how all of these configs are related |
855 |
+ # so that we don't need this disclaimer. |
856 |
+-config("optimize_speed") { |
857 |
++config("optimize_speed") { } |
858 |
++config("xoptimize_speed") { |
859 |
+ if (is_nacl && is_nacl_irt) { |
860 |
+ # The NaCl IRT is a special case and always wants its own config. |
861 |
+ # Various components do: |
862 |
+@@ -1973,7 +1944,8 @@ config("optimize_speed") { |
863 |
+ } |
864 |
+ } |
865 |
+ |
866 |
+-config("optimize_fuzzing") { |
867 |
++config("optimize_fuzzing") { } |
868 |
++config("xoptimize_fuzzing") { |
869 |
+ cflags = [ "-O1" ] + common_optimize_on_cflags |
870 |
+ ldflags = common_optimize_on_ldflags |
871 |
+ visibility = [ ":default_optimization" ] |
872 |
+@@ -2057,7 +2029,8 @@ config("afdo") { |
873 |
+ # configs += [ "//build/config/compiler:symbols" ] |
874 |
+ |
875 |
+ # Full symbols. |
876 |
+-config("symbols") { |
877 |
++config("symbols") { } |
878 |
++config("xsymbols") { |
879 |
+ if (is_win) { |
880 |
+ if (use_goma || is_clang) { |
881 |
+ # Note that with VC++ this requires is_win_fastlink, enforced elsewhere. |
882 |
+@@ -2155,7 +2128,8 @@ config("symbols") { |
883 |
+ # Minimal symbols. |
884 |
+ # This config guarantees to hold symbol for stack trace which are shown to user |
885 |
+ # when crash happens in unittests running on buildbot. |
886 |
+-config("minimal_symbols") { |
887 |
++config("minimal_symbols") { } |
888 |
++config("xminimal_symbols") { |
889 |
+ if (is_win) { |
890 |
+ # Linker symbols for backtraces only. |
891 |
+ cflags = [] |
892 |
+@@ -2186,7 +2160,8 @@ config("minimal_symbols") { |
893 |
+ } |
894 |
+ |
895 |
+ # No symbols. |
896 |
+-config("no_symbols") { |
897 |
++config("no_symbols") { } |
898 |
++config("xno_symbols") { |
899 |
+ if (!is_win) { |
900 |
+ cflags = [ "-g0" ] |
901 |
+ asmflags = cflags |
902 |
+-- |
903 |
+2.17.0 |
904 |
+ |
905 |
|
906 |
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r24.patch b/www-client/chromium/files/chromium-gn-bootstrap-r24.patch |
907 |
new file mode 100644 |
908 |
index 00000000000..0577dd4cf73 |
909 |
--- /dev/null |
910 |
+++ b/www-client/chromium/files/chromium-gn-bootstrap-r24.patch |
911 |
@@ -0,0 +1,31 @@ |
912 |
+From 8aca6d50942218ba7887b8b41a44e4f1b7d6f091 Mon Sep 17 00:00:00 2001 |
913 |
+From: Tom Anderson <thomasanderson@××××××××.org> |
914 |
+Date: Thu, 24 May 2018 22:39:20 +0000 |
915 |
+Subject: [PATCH] Fix gn bootstrap |
916 |
+ |
917 |
+R=dpranke |
918 |
+ |
919 |
+Change-Id: I469e7e478141e7c389f7a16a5e860122785bab44 |
920 |
+Reviewed-on: https://chromium-review.googlesource.com/1072740 |
921 |
+Reviewed-by: Dirk Pranke <dpranke@××××××××.org> |
922 |
+Commit-Queue: Thomas Anderson <thomasanderson@××××××××.org> |
923 |
+Cr-Commit-Position: refs/heads/master@{#561663} |
924 |
+--- |
925 |
+ tools/gn/bootstrap/bootstrap.py | 1 - |
926 |
+ 1 file changed, 1 deletion(-) |
927 |
+ |
928 |
+diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py |
929 |
+index 0d5f42a1d4a8..300abacdbca0 100755 |
930 |
+--- a/tools/gn/bootstrap/bootstrap.py |
931 |
++++ b/tools/gn/bootstrap/bootstrap.py |
932 |
+@@ -649,7 +649,6 @@ def write_gn_ninja(path, root_gen_dir, options, windows_x64_toolchain): |
933 |
+ 'base/trace_event/memory_peak_detector.cc', |
934 |
+ 'base/trace_event/memory_usage_estimator.cc', |
935 |
+ 'base/trace_event/process_memory_dump.cc', |
936 |
+- 'base/trace_event/sharded_allocation_register.cc', |
937 |
+ 'base/trace_event/trace_buffer.cc', |
938 |
+ 'base/trace_event/trace_config.cc', |
939 |
+ 'base/trace_event/trace_config_category_filter.cc', |
940 |
+-- |
941 |
+2.17.0 |
942 |
+ |