summaryrefslogtreecommitdiff
path: root/www/chromium/files/extra-patch-libc++-old
diff options
context:
space:
mode:
authorCarlos J. Puga Medina <cpm@FreeBSD.org>2017-09-17 11:10:43 +0000
committerCarlos J. Puga Medina <cpm@FreeBSD.org>2017-09-17 11:10:43 +0000
commit4181ea8c1c72a23fdd9f1253794cd99bc04b5bc1 (patch)
tree1bbf19adfa65f203d6dc4e226b48c372853bdb2d /www/chromium/files/extra-patch-libc++-old
parentsysutils/passwordsafe:Add Yubikey support (diff)
www/chromium: update to 61.0.3163.79
- Add arm64 support [1] - Fix segfault on i386 [2] - Switch to USES=compiler:c++14-lang for devel/chromium-gn because chromium needs __builtin_add_overflow and friends to build. Changelog: https://chromium.googlesource.com/chromium/src/+log/60.0.3112.113..61.0.3163.79?pretty=fuller&n=10000 PR: 220291 [1], 221266 [2] Submitted by: Andrew [1] Reported by: Patrick <doctorwhoguy@gmail.com> [2] MFH: 2017Q3
Diffstat (limited to 'www/chromium/files/extra-patch-libc++-old')
-rw-r--r--www/chromium/files/extra-patch-libc++-old117
1 files changed, 117 insertions, 0 deletions
diff --git a/www/chromium/files/extra-patch-libc++-old b/www/chromium/files/extra-patch-libc++-old
new file mode 100644
index 000000000000..368fc37c9cf5
--- /dev/null
+++ b/www/chromium/files/extra-patch-libc++-old
@@ -0,0 +1,117 @@
+--- tools/gn/bootstrap/bootstrap.py.orig 2017-09-05 21:05:47.000000000 +0200
++++ tools/gn/bootstrap/bootstrap.py 2017-09-10 19:20:25.156037000 +0200
+@@ -23,6 +23,7 @@
+ import shutil
+ import subprocess
+ import sys
++import platform
+ import tempfile
+
+ BOOTSTRAP_DIR = os.path.dirname(os.path.abspath(__file__))
+@@ -31,9 +32,10 @@
+
+ is_win = sys.platform.startswith('win')
+ is_linux = sys.platform.startswith('linux')
++is_bsd = platform.system().lower().endswith('bsd')
+ is_mac = sys.platform.startswith('darwin')
+ is_aix = sys.platform.startswith('aix')
+-is_posix = is_linux or is_mac or is_aix
++is_posix = is_linux or is_mac or is_aix or is_bsd
+
+ def check_call(cmd, **kwargs):
+ logging.debug('Running: %s', ' '.join(cmd))
+@@ -449,6 +451,7 @@
+ 'base/metrics/histogram_base.cc',
+ 'base/metrics/histogram_functions.cc',
+ 'base/metrics/histogram_samples.cc',
++ 'base/metrics/histogram_snapshot_manager.cc',
+ 'base/metrics/metrics_hashes.cc',
+ 'base/metrics/persistent_histogram_allocator.cc',
+ 'base/metrics/persistent_memory_allocator.cc',
+@@ -534,7 +537,7 @@
+ 'base/trace_event/heap_profiler_allocation_context_tracker.cc',
+ 'base/trace_event/heap_profiler_allocation_register.cc',
+ 'base/trace_event/heap_profiler_event_filter.cc',
+- 'base/trace_event/heap_profiler_event_writer.cc',
++ 'base/trace_event/heap_profiler_heap_dump_writer.cc',
+ 'base/trace_event/heap_profiler_serialization_state.cc',
+ 'base/trace_event/heap_profiler_stack_frame_deduplicator.cc',
+ 'base/trace_event/heap_profiler_type_name_deduplicator.cc',
+@@ -627,7 +630,7 @@
+ 'cflags': cflags + ['-DHAVE_CONFIG_H'],
+ }
+
+- if is_linux or is_aix:
++ if is_linux or is_aix or is_bsd:
+ ldflags.extend(['-pthread'])
+
+ static_libraries['xdg_user_dirs'] = {
+@@ -642,16 +645,45 @@
+ 'base/memory/shared_memory_tracker.cc',
+ 'base/nix/xdg_util.cc',
+ 'base/process/internal_linux.cc',
+- 'base/process/memory_linux.cc',
++ #'base/process/memory_linux.cc',
+ 'base/process/process_handle_linux.cc',
+ 'base/process/process_info_linux.cc',
+- 'base/process/process_iterator_linux.cc',
+- 'base/process/process_linux.cc',
+- 'base/process/process_metrics_linux.cc',
++ #'base/process/process_iterator_linux.cc',
++ #'base/process/process_linux.cc',
++ #'base/process/process_metrics_linux.cc',
+ 'base/strings/sys_string_conversions_posix.cc',
+- 'base/sys_info_linux.cc',
++ #'base/sys_info_linux.cc',
+ 'base/threading/platform_thread_linux.cc',
+ ])
++ if is_bsd:
++ libs.extend(['-lexecinfo', '-lkvm'])
++ ldflags.extend(['-pthread'])
++
++ static_libraries['xdg_user_dirs'] = {
++ 'sources': [
++ 'base/third_party/xdg_user_dirs/xdg_user_dir_lookup.cc',
++ ],
++ 'tool': 'cxx',
++ }
++ static_libraries['base']['sources'].extend([
++ 'base/allocator/allocator_shim.cc',
++ 'base/allocator/allocator_shim_default_dispatch_to_glibc.cc',
++ 'base/process/process_handle_' + platform.system().lower() + '.cc',
++ 'base/process/process_iterator_' + platform.system().lower() + '.cc',
++ 'base/process/process_metrics_'+ platform.system().lower() + '.cc',
++ 'base/sys_info_' + platform.system().lower() + '.cc',
++ ])
++ static_libraries['libevent']['include_dirs'].extend([
++ os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'freebsd')
++ ])
++ static_libraries['libevent']['sources'].extend([
++ 'base/third_party/libevent/kqueue.c',
++ ])
++
++ # Suppressing warnings
++ cflags.extend(['-Wno-deprecated-register', '-Wno-parentheses-equality'])
++ cflags_cc.extend(['-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1'])
++
+ if is_linux:
+ static_libraries['base']['sources'].extend([
+ 'base/allocator/allocator_shim.cc',
+@@ -663,17 +695,6 @@
+ ])
+ static_libraries['libevent']['sources'].extend([
+ 'base/third_party/libevent/epoll.c',
+- ])
+- else:
+- libs.extend(['-lrt'])
+- static_libraries['base']['sources'].extend([
+- 'base/process/internal_aix.cc'
+- ])
+- static_libraries['libevent']['include_dirs'].extend([
+- os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'aix')
+- ])
+- static_libraries['libevent']['include_dirs'].extend([
+- os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'compat')
+ ])
+
+ if is_mac: