diff options
Diffstat (limited to 'devel/electron4/files/patch-base_BUILD.gn')
-rw-r--r-- | devel/electron4/files/patch-base_BUILD.gn | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/devel/electron4/files/patch-base_BUILD.gn b/devel/electron4/files/patch-base_BUILD.gn new file mode 100644 index 000000000000..0c88c218b6d1 --- /dev/null +++ b/devel/electron4/files/patch-base_BUILD.gn @@ -0,0 +1,67 @@ +--- base/BUILD.gn.orig 2019-03-16 09:15:20 UTC ++++ base/BUILD.gn +@@ -1248,7 +1248,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 ((is_android || (is_linux && !is_chromecast)) && ++ if ((is_android || (is_linux && !is_chromecast) && !is_clang) && + host_toolchain != "//build/toolchain/cros:host") { + libs += [ "atomic" ] + } +@@ -1274,7 +1274,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 += [ +@@ -1704,6 +1704,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_linux.cc", ++ "process/process_handle_linux.cc", ++ "process/process_iterator_linux.cc", ++ "process/process_metrics_linux.cc", ++ "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", ++ "sys_info_freebsd.cc", ++ ] ++ libs = [ ++ "execinfo", # logging.cc ++ "kvm" # process_metrics_freebsd ++ ] ++ } ++ + # iOS + if (is_ios) { + set_sources_assignment_filter([]) +@@ -2692,6 +2719,12 @@ test("base_unittests") { + "trace_event/trace_event_android_unittest.cc", + ] + set_sources_assignment_filter(sources_assignment_filter) ++ } ++ ++ if (is_bsd) { ++ sources -= [ ++ "debug/proc_maps_linux_unittest.cc", ++ ] + } + + if (is_win) { |