mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-06 06:30:19 +00:00
2dd4dd29c0
Submitted by: Matthias Wolf via GitHub MFH: 2020Q3 Security: http://vuxml.freebsd.org/freebsd/9a447f78-d0f8-11ea-9837-e09467587c17.html Security: http://vuxml.freebsd.org/freebsd/870d59b0-c6c4-11ea-8015-e09467587c17.html
108 lines
3.5 KiB
Plaintext
108 lines
3.5 KiB
Plaintext
--- base/BUILD.gn.orig 2020-07-07 21:58:11 UTC
|
|
+++ base/BUILD.gn
|
|
@@ -60,7 +60,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.
|
|
- from_here_uses_location_builtins = !is_official_build
|
|
+ from_here_uses_location_builtins = !is_official_build && !is_bsd
|
|
|
|
# Unsafe developer build. Has developer-friendly features that may weaken or
|
|
# disable security measures like sandboxing or ASLR.
|
|
@@ -936,7 +936,7 @@ jumbo_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) {
|
|
sources += [
|
|
"profiler/stack_copier_signal.cc",
|
|
"profiler/stack_copier_signal.h",
|
|
@@ -945,6 +945,12 @@ jumbo_component("base") {
|
|
"profiler/thread_delegate_posix.h",
|
|
]
|
|
}
|
|
+
|
|
+ if (is_bsd) {
|
|
+ sources += [
|
|
+ "profiler/stack_sampler_posix.cc",
|
|
+ ]
|
|
+ }
|
|
}
|
|
|
|
if (is_win) {
|
|
@@ -1329,7 +1335,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" ]
|
|
}
|
|
@@ -1355,7 +1361,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 += [
|
|
@@ -1952,6 +1958,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 -= [
|
|
@@ -2946,7 +2979,7 @@ test("base_unittests") {
|
|
"posix/unix_domain_socket_unittest.cc",
|
|
"task/thread_pool/task_tracker_posix_unittest.cc",
|
|
]
|
|
- if (!is_nacl && !is_mac && !is_ios) {
|
|
+ if (!is_nacl && !is_mac && !is_ios && !is_bsd) {
|
|
sources += [ "profiler/stack_copier_signal_unittest.cc" ]
|
|
}
|
|
}
|
|
@@ -3154,6 +3187,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" ]
|