aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-base_BUILD.gn
diff options
context:
space:
mode:
authorJoseph Mingrone <jrm@FreeBSD.org>2020-12-01 04:06:37 +0000
committerJoseph Mingrone <jrm@FreeBSD.org>2020-12-01 04:06:37 +0000
commita0dbfe2fb016ec18b858d0857d8c3ce21662d29c (patch)
tree0454226a8e0acc85a44cfa5e09502134947dbdef /www/chromium/files/patch-base_BUILD.gn
parente5c06c3d469efbf9ebf06547ef5b2694260b981f (diff)
downloadports-a0dbfe2fb016ec18b858d0857d8c3ce21662d29c.tar.gz
ports-a0dbfe2fb016ec18b858d0857d8c3ce21662d29c.zip
www/chromium: Update to version 87.0.4280.66
Submitted by: Matthias Wolf, cem, rene Obtained from: Some patches from OpenBSD port (robert@openbsd.org)
Notes
Notes: svn path=/head/; revision=556709
Diffstat (limited to 'www/chromium/files/patch-base_BUILD.gn')
-rw-r--r--www/chromium/files/patch-base_BUILD.gn89
1 files changed, 47 insertions, 42 deletions
diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn
index 407989aacea0..0ff1f5c9a661 100644
--- a/www/chromium/files/patch-base_BUILD.gn
+++ b/www/chromium/files/patch-base_BUILD.gn
@@ -1,6 +1,6 @@
---- base/BUILD.gn.orig 2020-09-08 19:13:57 UTC
+--- base/BUILD.gn.orig 2020-11-13 06:36:34 UTC
+++ base/BUILD.gn
-@@ -60,7 +60,7 @@ declare_args() {
+@@ -53,7 +53,7 @@ declare_args() {
# replacement base::Location::Current(). On by default in non-official builds
# for testing purposes.
# TODO(https://crbug.com/974061): remove this eventually.
@@ -9,21 +9,20 @@
# Unsafe developer build. Has developer-friendly features that may weaken or
# disable security measures like sandboxing or ASLR.
-@@ -887,7 +887,7 @@ jumbo_component("base") {
+@@ -878,7 +878,7 @@ component("base") {
"timer/hi_res_timer_manager_posix.cc",
]
-- if (!is_nacl && !is_mac && !is_ios) {
-+ if (!is_nacl && !is_mac && !is_ios && !is_bsd) {
+- if (!is_nacl && !is_apple) {
++ if (!is_nacl && !is_apple && !is_bsd) {
sources += [
- "profiler/stack_copier_signal.cc",
- "profiler/stack_copier_signal.h",
-@@ -896,6 +896,12 @@ jumbo_component("base") {
+ "cpu_affinity_posix.cc",
+ "cpu_affinity_posix.h",
+@@ -889,6 +889,11 @@ component("base") {
"profiler/thread_delegate_posix.h",
]
}
-+
-+ if (is_freebsd) {
++ if (is_bsd) {
+ sources += [
+ "profiler/stack_sampler_posix.cc",
+ ]
@@ -31,29 +30,38 @@
}
if (is_win) {
-@@ -1287,7 +1293,7 @@ jumbo_component("base") {
- # Needed for <atomic> if using newer C++ library than sysroot, except if
+@@ -1295,7 +1300,7 @@ component("base") {
# building inside the cros_sdk environment - use host_toolchain as a
# more robust check for this.
-- if (!use_sysroot && (is_android || (is_linux && !is_chromecast)) &&
-+ if (!use_sysroot && (is_android || (is_linux && !is_chromecast) && !is_clang) &&
+ if (!use_sysroot &&
+- (is_android || ((is_linux || is_chromeos) && !is_chromecast)) &&
++ (is_android || ((is_linux || is_chromeos) && !is_chromecast) && !is_clang) &&
host_toolchain != "//build/toolchain/cros:host") {
libs += [ "atomic" ]
}
-@@ -1313,7 +1319,7 @@ jumbo_component("base") {
- "allocator/allocator_shim_override_glibc_weak_symbols.h",
- ]
- deps += [ "//base/allocator:tcmalloc" ]
-- } else if (is_linux && use_allocator == "none") {
-+ } else if ((is_linux && !is_bsd) && use_allocator == "none") {
- sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
- } else if ((is_linux || is_android) && use_allocator == "partition") {
- # Cannot use the same dispatching for host-side binaries.
-@@ -1925,6 +1931,33 @@ jumbo_component("base") {
+@@ -1342,7 +1347,7 @@ component("base") {
+ "allocator/allocator_shim_default_dispatch_to_mac_zoned_malloc.cc",
+ ]
+ }
+- if (is_chromeos || is_linux) {
++ if ((is_chromeos || is_linux) && !is_bsd) {
+ sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
+ }
+ if (is_win) {
+@@ -1811,7 +1816,7 @@ component("base") {
+ ]
+ }
+
+- if (is_linux || is_chromeos || is_android) {
++ if ((is_linux || is_chromeos || is_android) && !is_bsd) {
+ sources += [
+ "allocator/partition_allocator/spinning_futex_linux.cc",
+ "allocator/partition_allocator/spinning_futex_linux.h",
+@@ -1956,6 +1961,34 @@ component("base") {
}
}
-+ if (is_freebsd) {
++ if (is_bsd) {
+ sources -= [
+ "files/file_path_watcher_linux.cc",
+ "files/file_util_linux.cc",
@@ -80,28 +88,25 @@
+ ]
+ }
+
++
# iOS
if (is_ios) {
sources -= [
-@@ -3026,7 +3059,7 @@ test("base_unittests") {
- "posix/unix_domain_socket_unittest.cc",
- "task/thread_pool/task_tracker_posix_unittest.cc",
+@@ -3069,7 +3102,7 @@ test("base_unittests") {
]
-- if (!is_nacl && !is_mac && !is_ios) {
-+ if (!is_nacl && !is_mac && !is_ios && !is_bsd) {
- sources += [ "profiler/stack_copier_signal_unittest.cc" ]
- }
}
-@@ -3240,6 +3273,12 @@ test("base_unittests") {
- manifest = "//build/config/fuchsia/tests.cmx"
+- if (is_linux || is_chromeos) {
++ if ((is_linux || is_chromeos) && !is_bsd) {
+ sources += [ "debug/proc_maps_linux_unittest.cc" ]
}
-+
-+ if (is_bsd) {
-+ sources -= [
-+ "debug/proc_maps_linux_unittest.cc",
-+ ]
-+ }
- if (!is_fuchsia && !is_ios) {
- sources += [ "files/file_locking_unittest.cc" ]
+@@ -3110,7 +3143,7 @@ test("base_unittests") {
+ "posix/unix_domain_socket_unittest.cc",
+ "task/thread_pool/task_tracker_posix_unittest.cc",
+ ]
+- if (!is_nacl && !is_apple) {
++ if (!is_nacl && !is_apple && !is_bsd) {
+ sources += [
+ "cpu_affinity_posix_unittest.cc",
+ "profiler/stack_copier_signal_unittest.cc",