aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-third__party_snappy_snappy.gyp
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-third__party_snappy_snappy.gyp')
-rw-r--r--www/chromium/files/patch-third__party_snappy_snappy.gyp121
1 files changed, 121 insertions, 0 deletions
diff --git a/www/chromium/files/patch-third__party_snappy_snappy.gyp b/www/chromium/files/patch-third__party_snappy_snappy.gyp
new file mode 100644
index 000000000000..ed9733f76e7f
--- /dev/null
+++ b/www/chromium/files/patch-third__party_snappy_snappy.gyp
@@ -0,0 +1,121 @@
+--- third_party/snappy/snappy.gyp.orig 2016-05-20 17:19:03 UTC
++++ third_party/snappy/snappy.gyp
+@@ -1,104 +1,29 @@
+-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
++# Copyright 2013 The Chromium Authors. All rights reserved.
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+ {
+-'variables': {
+- 'conditions': [
+- # Define an "os_include" variable that points at the OS-specific generated
+- # headers. These were generated by running the configure script offline.
+- ['os_posix == 1 and OS != "mac"', {
+- 'os_include': 'linux'
+- }],
+- ['OS=="mac"', {'os_include': 'mac'}],
+- ['OS=="win"', {'os_include': 'win32'}],
+- ],
+- 'use_system_libxml%': 0,
+- },
+ 'targets': [
+ {
+ 'target_name': 'snappy',
+- 'type': 'static_library',
+- 'include_dirs': [
+- '<(os_include)',
+- 'src',
+- '../..',
+- ],
+- 'direct_dependent_settings': {
+- 'include_dirs': [
+- '<(os_include)',
+- 'src',
+- ],
+- },
++ 'type': 'none',
+ 'variables': {
+- 'clang_warning_flags': [
+- # ComputeTable is unused,
+- # https://code.google.com/p/snappy/issues/detail?id=96
+- '-Wno-unused-function',
+- ],
+- 'clang_warning_flags_unset': [
+- # snappy-stubs-internal.h unapologetically has: using namespace std
+- # https://code.google.com/p/snappy/issues/detail?id=70
+- '-Wheader-hygiene',
++ 'headers_root_path': 'src',
++ 'header_filenames': [
++ 'snappy-c.h',
++ 'snappy-sinksource.h',
++ 'snappy-stubs-public.h',
++ 'snappy.h',
+ ],
+ },
+- 'sources': [
+- 'src/snappy-internal.h',
+- 'src/snappy-sinksource.cc',
+- 'src/snappy-sinksource.h',
+- 'src/snappy-stubs-internal.cc',
+- 'src/snappy-stubs-internal.h',
+- 'src/snappy.cc',
+- 'src/snappy.h',
+- ],
+- 'conditions': [
+- ['OS=="linux" or OS=="mac"', {
+- 'defines': [
+- # TODO(tfarina): Only Mac and Linux has the generated config.h for
+- # now. Generate the config.h for Windows too and enable this there
+- # as well.
+- 'HAVE_CONFIG_H=1',
+- ],
+- }],
+- ['OS=="win"', {
+- # Signed/unsigned comparison
+- 'msvs_disabled_warnings': [
+- # https://code.google.com/p/snappy/issues/detail?id=71
+- 4018,
+- # https://code.google.com/p/snappy/issues/detail?id=75
+- 4267,
+- ],
+- }],
+- ],
+- },
+- {
+- 'target_name': 'snappy_unittest',
+- 'type': 'executable',
+- 'sources': [
+- 'src/snappy-test.cc',
+- 'src/snappy-test.h',
+- 'src/snappy_unittest.cc',
+- ],
+- 'dependencies': [
+- 'snappy',
+- '../../base/base.gyp:base',
+- '../../testing/gtest.gyp:gtest',
+- '../../third_party/zlib/zlib.gyp:zlib',
++ 'includes': [
++ '../../build/shim_headers.gypi',
+ ],
+- 'variables': {
+- 'clang_warning_flags': [ '-Wno-return-type' ],
+- 'clang_warning_flags_unset': [ '-Wheader-hygiene' ],
++ 'link_settings': {
++ 'libraries': [
++ '-lsnappy',
++ ],
+ },
+- 'conditions': [
+- ['OS=="linux" or OS=="mac"', {
+- 'defines': [
+- # TODO(tfarina): Only Mac and Linux has the generated config.h for
+- # now. Generate the config.h for Windows too and enable this there
+- # as well.
+- 'HAVE_CONFIG_H=1',
+- ],
+- }],
+- ],
+ },
+ ],
+ }