OLD | NEW |
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 # Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 5 # Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
6 # for details. All rights reserved. Use of this source code is governed by a | 6 # for details. All rights reserved. Use of this source code is governed by a |
7 # BSD-style license that can be found in the LICENSE file. | 7 # BSD-style license that can be found in the LICENSE file. |
8 | 8 |
9 # This file is a modified copy of Chromium's src/net/third_party/nss/ssl.gyp. | 9 # This file is a modified copy of Chromium's src/net/third_party/nss/ssl.gyp. |
10 # Revision 199075 (this should agree with "nss_rev" in DEPS). | 10 # Revision 232552 (this should agree with "nss_rev" in DEPS). |
11 | 11 |
12 # The following modification was made to make sure we have the same | 12 # The following modification was made to make sure we have the same |
13 # xcode_settings on all configurations (otherwise we can't build with ninja): | 13 # xcode_settings on all configurations (otherwise we can't build with ninja): |
14 # 'configurations': { | 14 # 'configurations': { |
15 # 'Debug_Base': { | 15 # 'Debug_Base': { |
16 # + 'inherit_from': ['Dart_Base'], | 16 # + 'inherit_from': ['Dart_Base'], |
17 # 'defines': [ | 17 # 'defines': [ |
18 # 'DEBUG', | 18 # 'DEBUG', |
19 # ], | 19 # ], |
20 # }, | 20 # }, |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
95 'sources!': [ | 95 'sources!': [ |
96 '<(ssl_directory)/ssl/os2_err.c', | 96 '<(ssl_directory)/ssl/os2_err.c', |
97 '<(ssl_directory)/ssl/os2_err.h', | 97 '<(ssl_directory)/ssl/os2_err.h', |
98 ], | 98 ], |
99 'defines': [ | 99 'defines': [ |
100 'NO_PKCS11_BYPASS', | 100 'NO_PKCS11_BYPASS', |
101 'NSS_ENABLE_ECC', | 101 'NSS_ENABLE_ECC', |
102 'USE_UTIL_DIRECTLY', | 102 'USE_UTIL_DIRECTLY', |
103 ], | 103 ], |
104 'defines!': [ | 104 'defines!': [ |
105 # Regrettably, NSS can't be compiled with NO_NSPR_10_SUPPORT yet. | |
106 'NO_NSPR_10_SUPPORT', | |
107 'DEBUG', | 105 'DEBUG', |
108 ], | 106 ], |
109 'dependencies': [ | 107 'dependencies': [ |
110 # Changed by Dart. | 108 # Changed by Dart. |
111 'zlib.gyp:zlib_dart', # Added by Dart (the _dart postfix) | 109 'zlib.gyp:zlib_dart', # Added by Dart (the _dart postfix) |
112 # Dart: Start of copy of code from 'bodge' conditions section below. | 110 # Dart: Start of copy of code from 'bodge' conditions section below. |
113 'nss.gyp:nspr_dart', # Added by Dart (the _dart postfix) | 111 'nss.gyp:nspr_dart', # Added by Dart (the _dart postfix) |
114 'nss.gyp:nss_dart', # Added by Dart (the _dart postfix) | 112 'nss.gyp:nss_dart', # Added by Dart (the _dart postfix) |
115 ], | 113 ], |
116 'export_dependent_settings': [ | 114 'export_dependent_settings': [ |
(...skipping 26 matching lines...) Expand all Loading... |
143 ['os_posix == 1 and OS != "mac" and OS != "ios"', { | 141 ['os_posix == 1 and OS != "mac" and OS != "ios"', { |
144 'cflags!': ['-fvisibility=hidden'], | 142 'cflags!': ['-fvisibility=hidden'], |
145 }], | 143 }], |
146 ], | 144 ], |
147 }], | 145 }], |
148 [ 'clang == 1', { | 146 [ 'clang == 1', { |
149 'cflags': [ | 147 'cflags': [ |
150 # See http://crbug.com/138571#c8. In short, sslsecur.c picks up the | 148 # See http://crbug.com/138571#c8. In short, sslsecur.c picks up the |
151 # system's cert.h because cert.h isn't in chromium's repo. | 149 # system's cert.h because cert.h isn't in chromium's repo. |
152 '-Wno-incompatible-pointer-types', | 150 '-Wno-incompatible-pointer-types', |
| 151 |
| 152 # There is a broken header guard in /usr/include/nss/secmod.h: |
| 153 # https://bugzilla.mozilla.org/show_bug.cgi?id=884072 |
| 154 '-Wno-header-guard', |
153 ], | 155 ], |
154 }], | 156 }], |
155 # Added by Dart. | |
156 [ 'OS == "linux"', { | 157 [ 'OS == "linux"', { |
| 158 'link_settings': { |
| 159 'libraries': [ |
| 160 '-ldl', |
| 161 ], |
| 162 }, |
| 163 # Added by Dart. |
157 'defines': [ | 164 'defines': [ |
158 'XP_UNIX', | 165 'XP_UNIX', |
159 'NSS_PLATFORM_CLIENT_AUTH', | 166 'NSS_PLATFORM_CLIENT_AUTH', |
160 'NSS_USE_STATIC_LIBS', | 167 'NSS_USE_STATIC_LIBS', |
161 ], | 168 ], |
162 }], | 169 }], |
163 [ 'OS == "mac" or OS == "ios"', { | 170 [ 'OS == "mac" or OS == "ios"', { |
164 'defines': [ | 171 'defines': [ |
165 'XP_UNIX', | 172 'XP_UNIX', |
166 'DARWIN', | 173 'DARWIN', |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
200 'inherit_from': ['Dart_Base'], | 207 'inherit_from': ['Dart_Base'], |
201 'defines': [ | 208 'defines': [ |
202 'DEBUG', | 209 'DEBUG', |
203 ], | 210 ], |
204 }, | 211 }, |
205 }, | 212 }, |
206 }, | 213 }, |
207 ], | 214 ], |
208 }]], | 215 }]], |
209 } | 216 } |
OLD | NEW |