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

Side by Side Diff: build/linux/system.gyp

Issue 6962044: Revert 87315 - Revert 87309 - Second attempt to fix linux redux builder (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 6 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
« no previous file with comments | « base/base.gyp ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'conditions': [ 6 'conditions': [
7 ['sysroot!=""', { 7 ['sysroot!=""', {
8 'variables': { 8 'variables': {
9 'pkg-config': './pkg-config-wrapper "<(sysroot)"', 9 'pkg-config': './pkg-config-wrapper "<(sysroot)"',
10 }, 10 },
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 'ldflags': [ 67 'ldflags': [
68 '<!@(<(pkg-config) --libs-only-L --libs-only-other gtk+-unix-print -2.0)', 68 '<!@(<(pkg-config) --libs-only-L --libs-only-other gtk+-unix-print -2.0)',
69 ], 69 ],
70 'libraries': [ 70 'libraries': [
71 '<!@(<(pkg-config) --libs-only-l gtk+-unix-print-2.0)', 71 '<!@(<(pkg-config) --libs-only-l gtk+-unix-print-2.0)',
72 ], 72 ],
73 }, 73 },
74 }]] 74 }]]
75 }, 75 },
76 { 76 {
77 'target_name': 'nss', 77 'target_name': 'ssl',
78 'type': 'settings', 78 'type': 'settings',
79 'conditions': [ 79 'conditions': [
80 ['_toolset=="target"', { 80 ['_toolset=="target"', {
81 'conditions': [ 81 'conditions': [
82 ['use_system_ssl==0', { 82 ['use_openssl==1', {
83 'dependencies': [
84 '../../third_party/openssl/openssl.gyp:openssl',
85 ],
86 }],
87 ['use_openssl==0 and use_system_ssl==0', {
83 'dependencies': [ 88 'dependencies': [
84 '../../net/third_party/nss/ssl.gyp:ssl', 89 '../../net/third_party/nss/ssl.gyp:ssl',
85 '../../third_party/zlib/zlib.gyp:zlib', 90 '../../third_party/zlib/zlib.gyp:zlib',
86 ], 91 ],
87 'direct_dependent_settings': { 92 'direct_dependent_settings': {
88 'cflags': [ 93 'cflags': [
89 # We need for our local copies of the libssl3 headers to come 94 # We need for our local copies of the libssl3 headers to come
90 # first, otherwise the code will build, but will fallback to 95 # first, otherwise the code will build, but will fallback to
91 # the set of features advertised in the system headers. 96 # the set of features advertised in the system headers.
92 # Unfortunately, there's no include path that we can filter 97 # Unfortunately, there's no include path that we can filter
93 # out of $(pkg-config --cflags nss) and GYP include paths 98 # out of $(pkg-config --cflags nss) and GYP include paths
94 # come after cflags on the command line. So we have these 99 # come after cflags on the command line. So we have these
95 # bodges: 100 # bodges:
96 '-Inet/third_party/nss/ssl', # for mak e 101 '-Inet/third_party/nss/ssl', # for mak e
97 '-ISource/WebKit/chromium/net/third_party/nss/ssl', # for mak e in webkit 102 '-ISource/WebKit/chromium/net/third_party/nss/ssl', # for mak e in webkit
98 '<!@(<(pkg-config) --cflags nss)', 103 '<!@(<(pkg-config) --cflags nss)',
99 ], 104 ],
100 }, 105 },
101 'link_settings': { 106 'link_settings': {
102 'ldflags': [ 107 'ldflags': [
103 '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)', 108 '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)',
104 ], 109 ],
105 'libraries': [ 110 'libraries': [
106 '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")', 111 '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")',
107 ], 112 ],
108 }, 113 },
109 }, { 114 }],
115 ['use_openssl==0 and use_system_ssl==1', {
110 'direct_dependent_settings': { 116 'direct_dependent_settings': {
111 'cflags': [ 117 'cflags': [
112 '<!@(<(pkg-config) --cflags nss)', 118 '<!@(<(pkg-config) --cflags nss)',
113 ], 119 ],
114 'defines': [ 120 'defines': [
115 'USE_SYSTEM_SSL', 121 'USE_SYSTEM_SSL',
116 ], 122 ],
117 }, 123 },
118 'link_settings': { 124 'link_settings': {
119 'ldflags': [ 125 'ldflags': [
120 '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)', 126 '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)',
121 ], 127 ],
122 'libraries': [ 128 'libraries': [
123 '<!@(<(pkg-config) --libs-only-l nss)', 129 '<!@(<(pkg-config) --libs-only-l nss)',
124 ], 130 ],
125 }, 131 },
126 } 132 }],
127 ]] 133 ]
128 }], 134 }],
129 ], 135 ],
130 }, 136 },
131 { 137 {
132 'target_name': 'freetype2', 138 'target_name': 'freetype2',
133 'type': 'settings', 139 'type': 'settings',
134 'conditions': [ 140 'conditions': [
135 ['_toolset=="target"', { 141 ['_toolset=="target"', {
136 'direct_dependent_settings': { 142 'direct_dependent_settings': {
137 'cflags': [ 143 'cflags': [
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 ], 430 ],
425 }, 431 },
426 ], 432 ],
427 } 433 }
428 434
429 # Local Variables: 435 # Local Variables:
430 # tab-width:2 436 # tab-width:2
431 # indent-tabs-mode:nil 437 # indent-tabs-mode:nil
432 # End: 438 # End:
433 # vim: set expandtab tabstop=2 shiftwidth=2: 439 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « base/base.gyp ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698