mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-25 09:34:11 +00:00
01b2b9b6d6
This addresses some security issues, including at least one Google admits was being exploited in the wild. For more, see: https://chromereleases.googleblog.com/2020/02/stable-channel-update-for-desktop_24.html PR: 244625 Approved by: jrm, rene Security: CVE-2020-6407, CVE-2020-6418 (in the wild), CVE-2020-6420 Differential Revision: https://reviews.freebsd.org/D23984
68 lines
2.2 KiB
Plaintext
68 lines
2.2 KiB
Plaintext
--- base/BUILD.gn.orig 2020-03-03 18:53:46 UTC
|
|
+++ base/BUILD.gn
|
|
@@ -1302,7 +1302,7 @@ jumbo_component("base") {
|
|
# Needed for <atomic> if using newer C++ library than sysroot, except if
|
|
# 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) &&
|
|
host_toolchain != "//build/toolchain/cros:host") {
|
|
libs += [ "atomic" ]
|
|
}
|
|
@@ -1328,7 +1328,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_android && use_allocator == "none") {
|
|
sources += [
|
|
@@ -1919,6 +1919,33 @@ jumbo_component("base") {
|
|
}
|
|
}
|
|
|
|
+ if (is_bsd) {
|
|
+ sources -= [
|
|
+ "files/file_path_watcher_linux.cc",
|
|
+ "files/file_util_linux.cc",
|
|
+ "process/memory_linux.cc",
|
|
+ "process/process_handle_linux.cc",
|
|
+ "process/process_iterator_linux.cc",
|
|
+ "process/process_metrics_linux.cc",
|
|
+ "system/sys_info_linux.cc"
|
|
+ ]
|
|
+ sources += [
|
|
+ "files/file_path_watcher_kqueue.cc",
|
|
+ "files/file_path_watcher_kqueue.h",
|
|
+ "files/file_path_watcher_stub.cc",
|
|
+ "process/memory_stubs.cc",
|
|
+ "process/process_handle_freebsd.cc",
|
|
+ "process/process_iterator_freebsd.cc",
|
|
+ "process/process_metrics_freebsd.cc",
|
|
+ "system/sys_info_freebsd.cc",
|
|
+ ]
|
|
+ libs = [
|
|
+ "execinfo", # logging.cc
|
|
+ "kvm", # process_metrics_freebsd
|
|
+ "util" # process_metrics_freebsd
|
|
+ ]
|
|
+ }
|
|
+
|
|
# iOS
|
|
if (is_ios) {
|
|
sources -= [
|
|
@@ -3069,6 +3096,12 @@ test("base_unittests") {
|
|
|
|
manifest = "//build/config/fuchsia/tests.cmx"
|
|
}
|
|
+
|
|
+ if (is_bsd) {
|
|
+ sources -= [
|
|
+ "debug/proc_maps_linux_unittest.cc",
|
|
+ ]
|
|
+ }
|
|
|
|
if (!is_fuchsia && !is_ios) {
|
|
sources += [ "files/file_locking_unittest.cc" ]
|