aboutsummaryrefslogtreecommitdiffstats
path: root/community/chromium/gn_bootstrap.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2017-08-08 13:34:16 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2017-09-15 13:37:11 +0000
commitd183e852a762296b473c33e9ce106f52a4359dae (patch)
tree2f92f891d7ff1fc4b4aa0551bd7b28218b30b9d3 /community/chromium/gn_bootstrap.patch
parent0d4667363c89e53a83538d90acdc612739d061db (diff)
downloadaports-d183e852a762296b473c33e9ce106f52a4359dae.tar.bz2
aports-d183e852a762296b473c33e9ce106f52a4359dae.tar.xz
community/chromium: upgrade to 61.0.3163.79
to fix tab crashes, use patch from https://github.com/lluixhi/musl-extras/issues/10#issuecomment-328272349 use various patches from fedora
Diffstat (limited to 'community/chromium/gn_bootstrap.patch')
-rw-r--r--community/chromium/gn_bootstrap.patch140
1 files changed, 57 insertions, 83 deletions
diff --git a/community/chromium/gn_bootstrap.patch b/community/chromium/gn_bootstrap.patch
index 662a67f35f..5280669339 100644
--- a/community/chromium/gn_bootstrap.patch
+++ b/community/chromium/gn_bootstrap.patch
@@ -1,15 +1,33 @@
---- tools/gn/bootstrap/bootstrap.py.orig 2016-11-17 00:15:29.112867732 +0100
-+++ tools/gn/bootstrap/bootstrap.py 2016-11-17 00:43:54.712718406 +0100
-@@ -159,7 +159,7 @@
+diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
+index 1390560..5ce7832 100755
+--- tools/gn/bootstrap/bootstrap.py
++++ tools/gn/bootstrap/bootstrap.py
+@@ -20,6 +20,7 @@ import errno
+ import logging
+ import optparse
+ import os
++import platform
+ import shutil
+ import subprocess
+ import sys
+@@ -31,6 +32,7 @@ SRC_ROOT = os.path.dirname(os.path.dirname(GN_ROOT))
+
+ is_win = sys.platform.startswith('win')
+ is_linux = sys.platform.startswith('linux')
++is_gnu_linux = is_linux and platform.libc_ver()[0].startswith('glibc')
+ is_mac = sys.platform.startswith('darwin')
+ is_aix = sys.platform.startswith('aix')
+ is_posix = is_linux or is_mac or is_aix
+@@ -167,7 +169,7 @@ def build_gn_with_ninja_manually(tempdir, options):
mkdir_p(root_gen_dir)
-
+
write_buildflag_header_manually(root_gen_dir, 'base/allocator/features.h',
-- {'USE_EXPERIMENTAL_ALLOCATOR_SHIM': 'true' if is_linux else 'false'})
-+ {'USE_EXPERIMENTAL_ALLOCATOR_SHIM': 'false'})
-
+- {'USE_ALLOCATOR_SHIM': 'true' if is_linux else 'false'})
++ {'USE_ALLOCATOR_SHIM': 'true' if is_gnu_linux else 'false'})
+
write_buildflag_header_manually(root_gen_dir, 'base/debug/debugging_flags.h',
- {'ENABLE_PROFILING': 'false'})
-@@ -366,8 +366,6 @@
+ {
+@@ -395,8 +397,6 @@ def write_gn_ninja(path, root_gen_dir, options):
'base/third_party/superfasthash/superfasthash.c',
])
static_libraries['base']['sources'].extend([
@@ -18,80 +36,36 @@
'base/at_exit.cc',
'base/base_paths.cc',
'base/base_switches.cc',
-@@ -541,29 +539,9 @@
- 'base/time/time_posix.cc',
- 'base/trace_event/heap_profiler_allocation_register_posix.cc',
+@@ -449,6 +449,7 @@ def write_gn_ninja(path, root_gen_dir, options):
+ '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 +535,7 @@ def write_gn_ninja(path, root_gen_dir, options):
+ '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',
+@@ -653,10 +654,11 @@ def write_gn_ninja(path, root_gen_dir, options):
+ 'base/threading/platform_thread_linux.cc',
])
-- static_libraries['libevent'] = {
-- 'sources': [
-- 'base/third_party/libevent/buffer.c',
-- 'base/third_party/libevent/evbuffer.c',
-- 'base/third_party/libevent/evdns.c',
-- 'base/third_party/libevent/event.c',
-- 'base/third_party/libevent/event_tagging.c',
-- 'base/third_party/libevent/evrpc.c',
-- 'base/third_party/libevent/evutil.c',
-- 'base/third_party/libevent/http.c',
-- 'base/third_party/libevent/log.c',
-- 'base/third_party/libevent/poll.c',
-- 'base/third_party/libevent/select.c',
-- 'base/third_party/libevent/signal.c',
-- 'base/third_party/libevent/strlcpy.c',
-- ],
-- 'tool': 'cc',
-- 'include_dirs': [],
-- 'cflags': cflags + ['-DHAVE_CONFIG_H'],
-- }
-
- if is_linux:
-- libs.extend(['-lrt', '-latomic'])
-+ libs.extend(['-lrt', '-levent'])
- ldflags.extend(['-pthread'])
-
- static_libraries['xdg_user_dirs'] = {
-@@ -573,8 +551,6 @@
- 'tool': 'cxx',
- }
- static_libraries['base']['sources'].extend([
+ if is_linux:
+- static_libraries['base']['sources'].extend([
- 'base/allocator/allocator_shim.cc',
- 'base/allocator/allocator_shim_default_dispatch_to_glibc.cc',
- 'base/memory/shared_memory_posix.cc',
- 'base/nix/xdg_util.cc',
- 'base/process/internal_linux.cc',
-@@ -587,12 +563,6 @@
- 'base/threading/platform_thread_linux.cc',
- 'base/trace_event/malloc_dump_provider.cc',
- ])
-- static_libraries['libevent']['include_dirs'].extend([
-- os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'linux')
-- ])
-- static_libraries['libevent']['sources'].extend([
-- 'base/third_party/libevent/epoll.c',
-- ])
-
-
- if is_mac:
---- base/message_loop/message_pump_libevent.cc.orig 2016-11-17 01:07:57.633819544 +0100
-+++ base/message_loop/message_pump_libevent.cc 2016-11-17 01:08:38.985851678 +0100
-@@ -14,7 +14,7 @@
- #include "base/files/file_util.h"
- #include "base/logging.h"
- #include "base/posix/eintr_wrapper.h"
--#include "base/third_party/libevent/event.h"
-+#include "event.h"
- #include "base/time/time.h"
- #include "base/trace_event/trace_event.h"
- #include "build/build_config.h"
---- base/native_library_posix.cc.orig 2016-11-17 01:45:50.032002326 +0100
-+++ base/native_library_posix.cc 2016-11-17 01:46:23.729001549 +0100
-@@ -12,6 +12,10 @@
- #include "base/strings/utf_string_conversions.h"
- #include "base/threading/thread_restrictions.h"
-
-+#ifndef RTLD_DEEPBIND
-+#define RTLD_DEEPBIND 0
-+#endif
-+
- namespace base {
-
- std::string NativeLibraryLoadError::ToString() const {
+- ])
++ if is_gnu_linux:
++ static_libraries['base']['sources'].extend([
++ 'base/allocator/allocator_shim.cc',
++ 'base/allocator/allocator_shim_default_dispatch_to_glibc.cc',
++ ])
+ libs.extend(['-lrt', '-latomic'])
+ static_libraries['libevent']['include_dirs'].extend([
+ os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'linux')