diff options
author | Mike Gilbert <floppym@gentoo.org> | 2018-05-29 15:35:46 -0400 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2018-05-29 15:36:07 -0400 |
commit | 5b2f7120e58504ed523aca3ff382d55a5e24e8f5 (patch) | |
tree | 158d97ab90599f157ada3e673ba54cc2e89bf494 /www-client/chromium/files | |
parent | net-wireless/kismet: upstream re-broke setuptools (diff) | |
download | gentoo-5b2f7120e58504ed523aca3ff382d55a5e24e8f5.tar.gz gentoo-5b2f7120e58504ed523aca3ff382d55a5e24e8f5.tar.bz2 gentoo-5b2f7120e58504ed523aca3ff382d55a5e24e8f5.zip |
www-client/chromium: dev channel bump (68.0.3438.3)
Package-Manager: Portage-2.3.40_p8, Repoman-2.3.9_p240
Diffstat (limited to 'www-client/chromium/files')
-rw-r--r-- | www-client/chromium/files/chromium-compiler-r2.patch | 168 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-gn-bootstrap-r24.patch | 31 |
2 files changed, 199 insertions, 0 deletions
diff --git a/www-client/chromium/files/chromium-compiler-r2.patch b/www-client/chromium/files/chromium-compiler-r2.patch new file mode 100644 index 000000000000..3ac2eb81f4cb --- /dev/null +++ b/www-client/chromium/files/chromium-compiler-r2.patch @@ -0,0 +1,168 @@ +From 4310db462fab74bf14066f2a6f7cf250ecba0cf1 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Wed, 25 Apr 2018 13:22:49 -0400 +Subject: [PATCH] Disable various compiler configs + +--- + build/config/compiler/BUILD.gn | 61 ++++++++++------------------------ + 1 file changed, 18 insertions(+), 43 deletions(-) + +diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn +index 83337d52e4b9..f2c192fc31ca 100644 +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -228,8 +228,6 @@ config("compiler") { + + configs += [ + # See the definitions below. +- ":clang_revision", +- ":compiler_cpu_abi", + ":compiler_codegen", + ] + +@@ -488,18 +486,6 @@ config("compiler") { + } + } + +- if (is_clang && !is_nacl && current_toolchain == host_toolchain && +- target_os != "chromeos") { +- cflags += [ +- # TODO(hans): Remove this once Clang generates better optimized debug info +- # by default. https://crbug.com/765793 +- "-Xclang", +- "-mllvm", +- "-Xclang", +- "-instcombine-lower-dbg-declare=0", +- ] +- } +- + # Print absolute paths in diagnostics. There is no precedent for doing this + # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and + # Windows developers rely on it (crbug.com/636109) so only do this on Windows. +@@ -1415,10 +1401,6 @@ config("default_warnings") { + + # TODO(hans): https://crbug.com/766891 + "-Wno-null-pointer-arithmetic", +- +- # Ignore warnings about MSVC optimization pragmas. +- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314 +- "-Wno-ignored-pragma-optimize", + ] + } else if (use_xcode_clang) { + cflags += [ +@@ -1462,22 +1444,6 @@ config("chromium_code") { + "__STDC_FORMAT_MACROS", + ] + +- if (!is_debug && !using_sanitizer && +- (!is_linux || !is_clang || is_official_build) && +- current_cpu != "s390x" && current_cpu != "s390" && +- current_cpu != "ppc64" && current_cpu != "ppc64" && +- current_cpu != "mips" && current_cpu != "mips64") { +- # _FORTIFY_SOURCE isn't really supported by Clang now, see +- # http://llvm.org/bugs/show_bug.cgi?id=16821. +- # It seems to work fine with Ubuntu 12 headers though, so use it in +- # official builds. +- # +- # Non-chromium code is not guaranteed to compile cleanly with +- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are +- # disabled, so only do that for Release build. +- defines += [ "_FORTIFY_SOURCE=2" ] +- } +- + if (is_mac || is_ios) { + cflags_objc = [ "-Wobjc-missing-property-synthesis" ] + cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] +@@ -1807,7 +1773,8 @@ config("default_stack_frames") { + } + + # Default "optimization on" config. +-config("optimize") { ++config("optimize") { } ++config("xoptimize") { + if (is_win) { + # TODO(thakis): Remove is_clang here, https://crbug.com/598772 + if (is_official_build && full_wpo_on_official && !is_clang) { +@@ -1841,7 +1808,8 @@ config("optimize") { + } + + # Same config as 'optimize' but without the WPO flag. +-config("optimize_no_wpo") { ++config("optimize_no_wpo") { } ++config("xoptimize_no_wpo") { + if (is_win) { + # Favor size over speed, /O1 must be before the common flags. The GYP + # build also specifies /Os and /GF but these are implied by /O1. +@@ -1864,7 +1832,8 @@ config("optimize_no_wpo") { + } + + # Turn off optimizations. +-config("no_optimize") { ++config("no_optimize") { } ++config("xno_optimize") { + if (is_win) { + cflags = [ + "/Od", # Disable optimization. +@@ -1888,7 +1857,8 @@ config("no_optimize") { + # Turns up the optimization level. On Windows, this implies whole program + # optimization and link-time code generation which is very expensive and should + # be used sparingly. +-config("optimize_max") { ++config("optimize_max") { } ++config("xoptimize_max") { + if (is_nacl && is_nacl_irt) { + # The NaCl IRT is a special case and always wants its own config. + # Various components do: +@@ -1935,7 +1905,8 @@ config("optimize_max") { + # + # TODO(crbug.com/621335) - rework how all of these configs are related + # so that we don't need this disclaimer. +-config("optimize_speed") { ++config("optimize_speed") { } ++config("xoptimize_speed") { + if (is_nacl && is_nacl_irt) { + # The NaCl IRT is a special case and always wants its own config. + # Various components do: +@@ -1973,7 +1944,8 @@ config("optimize_speed") { + } + } + +-config("optimize_fuzzing") { ++config("optimize_fuzzing") { } ++config("xoptimize_fuzzing") { + cflags = [ "-O1" ] + common_optimize_on_cflags + ldflags = common_optimize_on_ldflags + visibility = [ ":default_optimization" ] +@@ -2057,7 +2029,8 @@ config("afdo") { + # configs += [ "//build/config/compiler:symbols" ] + + # Full symbols. +-config("symbols") { ++config("symbols") { } ++config("xsymbols") { + if (is_win) { + if (use_goma || is_clang) { + # Note that with VC++ this requires is_win_fastlink, enforced elsewhere. +@@ -2155,7 +2128,8 @@ config("symbols") { + # Minimal symbols. + # This config guarantees to hold symbol for stack trace which are shown to user + # when crash happens in unittests running on buildbot. +-config("minimal_symbols") { ++config("minimal_symbols") { } ++config("xminimal_symbols") { + if (is_win) { + # Linker symbols for backtraces only. + cflags = [] +@@ -2186,7 +2160,8 @@ config("minimal_symbols") { + } + + # No symbols. +-config("no_symbols") { ++config("no_symbols") { } ++config("xno_symbols") { + if (!is_win) { + cflags = [ "-g0" ] + asmflags = cflags +-- +2.17.0 + diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r24.patch b/www-client/chromium/files/chromium-gn-bootstrap-r24.patch new file mode 100644 index 000000000000..0577dd4cf73b --- /dev/null +++ b/www-client/chromium/files/chromium-gn-bootstrap-r24.patch @@ -0,0 +1,31 @@ +From 8aca6d50942218ba7887b8b41a44e4f1b7d6f091 Mon Sep 17 00:00:00 2001 +From: Tom Anderson <thomasanderson@chromium.org> +Date: Thu, 24 May 2018 22:39:20 +0000 +Subject: [PATCH] Fix gn bootstrap + +R=dpranke + +Change-Id: I469e7e478141e7c389f7a16a5e860122785bab44 +Reviewed-on: https://chromium-review.googlesource.com/1072740 +Reviewed-by: Dirk Pranke <dpranke@chromium.org> +Commit-Queue: Thomas Anderson <thomasanderson@chromium.org> +Cr-Commit-Position: refs/heads/master@{#561663} +--- + tools/gn/bootstrap/bootstrap.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py +index 0d5f42a1d4a8..300abacdbca0 100755 +--- a/tools/gn/bootstrap/bootstrap.py ++++ b/tools/gn/bootstrap/bootstrap.py +@@ -649,7 +649,6 @@ def write_gn_ninja(path, root_gen_dir, options, windows_x64_toolchain): + 'base/trace_event/memory_peak_detector.cc', + 'base/trace_event/memory_usage_estimator.cc', + 'base/trace_event/process_memory_dump.cc', +- 'base/trace_event/sharded_allocation_register.cc', + 'base/trace_event/trace_buffer.cc', + 'base/trace_event/trace_config.cc', + 'base/trace_event/trace_config_category_filter.cc', +-- +2.17.0 + |