Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(959)

Side by Side Diff: third_party/sqlite/sqlite.gyp

Issue 203076: Fix the Linux shared build. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 { 5 {
6 'variables': { 6 'variables': {
7 'use_system_sqlite%': 0, 7 'use_system_sqlite%': 0,
8 'required_sqlite_version': '3.6.1', 8 'required_sqlite_version': '3.6.1',
9 }, 9 },
10 'includes': [ 10 'includes': [
11 '../../build/common.gypi', 11 '../../build/common.gypi',
12 ], 12 ],
13 'target_defaults': { 13 'target_defaults': {
14 'defines': [ 14 'defines': [
15 'SQLITE_ENABLE_FTS2', 15 'SQLITE_ENABLE_FTS2',
16 'SQLITE_ENABLE_BROKEN_FTS2', 16 'SQLITE_ENABLE_BROKEN_FTS2',
17 'SQLITE_ENABLE_ICU', 17 'SQLITE_ENABLE_ICU',
18 'SQLITE_SECURE_DELETE', 18 'SQLITE_SECURE_DELETE',
19 'THREADSAFE', 19 'THREADSAFE',
20 '_HAS_EXCEPTIONS=0', 20 '_HAS_EXCEPTIONS=0',
21 ], 21 ],
22 }, 22 },
23 'targets': [ 23 'targets': [
24 { 24 {
25 'target_name': 'sqlite', 25 'target_name': 'sqlite',
26 'conditions': [ 26 'conditions': [
27 ['OS=="linux" and not use_system_sqlite', {
28 'link_settings': {
29 'libraries': [
30 '-ldl',
31 ],
32 },
33 }],
27 ['OS=="linux" and use_system_sqlite', { 34 ['OS=="linux" and use_system_sqlite', {
28 'type': 'settings', 35 'type': 'settings',
29 'direct_dependent_settings': { 36 'direct_dependent_settings': {
30 'cflags': [ 37 'cflags': [
31 # This next command produces no output but it it will fail (and 38 # This next command produces no output but it it will fail (and
32 # cause GYP to fail) if we don't have a recent enough version of 39 # cause GYP to fail) if we don't have a recent enough version of
33 # sqlite. 40 # sqlite.
34 '<!@(pkg-config --atleast-version=<(required_sqlite_version) sqlit e3)', 41 '<!@(pkg-config --atleast-version=<(required_sqlite_version) sqlit e3)',
35 42
36 '<!@(pkg-config --cflags sqlite3)', 43 '<!@(pkg-config --cflags sqlite3)',
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 'dependencies': [ 224 'dependencies': [
218 '../icu/icu.gyp:icuuc', 225 '../icu/icu.gyp:icuuc',
219 'sqlite', 226 'sqlite',
220 ], 227 ],
221 'sources': [ 228 'sources': [
222 'src/shell.c', 229 'src/shell.c',
223 'src/shell_icu_linux.c', 230 'src/shell_icu_linux.c',
224 ], 231 ],
225 'link_settings': { 232 'link_settings': {
226 'link_languages': ['c++'], 233 'link_languages': ['c++'],
227 'libraries': [
228 '-ldl',
229 ],
230 }, 234 },
231 }, 235 },
232 ], 236 ],
233 },] 237 },]
234 ], 238 ],
235 } 239 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698