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

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

Issue 831453004: Do not depend on or try to configure pangocairo when use_pango == 0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Keep pangocario target unconditionally Created 5 years, 11 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
« no previous file with comments | « no previous file | skia/skia_library.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) 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 { 5 {
6 'variables': { 6 'variables': {
7 'conditions': [ 7 'conditions': [
8 ['sysroot!=""', { 8 ['sysroot!=""', {
9 'pkg-config': '<(chroot_cmd) ./pkg-config-wrapper "<(sysroot)" "<(target _arch)" "<(system_libdir)"', 9 'pkg-config': '<(chroot_cmd) ./pkg-config-wrapper "<(sysroot)" "<(target _arch)" "<(system_libdir)"',
10 }, { 10 }, {
(...skipping 1092 matching lines...) Expand 10 before | Expand all | Expand 10 after
1103 'message': 'Generating libspeechd library loader', 1103 'message': 'Generating libspeechd library loader',
1104 'process_outputs_as_sources': 1, 1104 'process_outputs_as_sources': 1,
1105 }, 1105 },
1106 ], 1106 ],
1107 }, 1107 },
1108 { 1108 {
1109 'target_name': 'pangocairo', 1109 'target_name': 'pangocairo',
1110 'type': 'none', 1110 'type': 'none',
1111 'toolsets': ['host', 'target'], 1111 'toolsets': ['host', 'target'],
1112 'conditions': [ 1112 'conditions': [
1113 ['_toolset=="target"', { 1113 ['use_pango==1 and use_cairo==1', {
1114 'direct_dependent_settings': { 1114 'conditions': [
1115 'cflags': [ 1115 ['_toolset=="target"', {
1116 '<!@(<(pkg-config) --cflags pangocairo pangoft2)', 1116 'direct_dependent_settings': {
1117 ], 1117 'cflags': [
1118 }, 1118 '<!@(<(pkg-config) --cflags pangocairo pangoft2)',
1119 'link_settings': { 1119 ],
1120 'ldflags': [ 1120 },
1121 '<!@(<(pkg-config) --libs-only-L --libs-only-other pangocairo pang oft2)', 1121 'link_settings': {
1122 ], 1122 'ldflags': [
1123 'libraries': [ 1123 '<!@(<(pkg-config) --libs-only-L --libs-only-other pangocairo pangoft2)',
1124 '<!@(<(pkg-config) --libs-only-l pangocairo pangoft2)', 1124 ],
1125 ], 1125 'libraries': [
1126 }, 1126 '<!@(<(pkg-config) --libs-only-l pangocairo pangoft2)',
1127 }, { 1127 ],
1128 'direct_dependent_settings': { 1128 },
1129 'cflags': [ 1129 }, {
1130 '<!@(pkg-config --cflags pangocairo pangoft2)', 1130 'direct_dependent_settings': {
1131 ], 1131 'cflags': [
1132 }, 1132 '<!@(pkg-config --cflags pangocairo pangoft2)',
1133 'link_settings': { 1133 ],
1134 'ldflags': [ 1134 },
1135 '<!@(pkg-config --libs-only-L --libs-only-other pangocairo pangoft 2)', 1135 'link_settings': {
1136 ], 1136 'ldflags': [
1137 'libraries': [ 1137 '<!@(pkg-config --libs-only-L --libs-only-other pangocairo pan goft2)',
1138 '<!@(pkg-config --libs-only-l pangocairo pangoft2)', 1138 ],
1139 ], 1139 'libraries': [
1140 }, 1140 '<!@(pkg-config --libs-only-l pangocairo pangoft2)',
1141 ],
1142 },
1143 }],
1144 ],
1141 }], 1145 }],
1142 ], 1146 ],
1143 }, 1147 },
1144 { 1148 {
1145 'target_name': 'ssl', 1149 'target_name': 'ssl',
1146 'type': 'none', 1150 'type': 'none',
1147 'conditions': [ 1151 'conditions': [
1148 ['_toolset=="target"', { 1152 ['_toolset=="target"', {
1149 'conditions': [ 1153 'conditions': [
1150 ['use_openssl==1', { 1154 ['use_openssl==1', {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
1183 '-Wno-header-guard', 1187 '-Wno-header-guard',
1184 ], 1188 ],
1185 }, 1189 },
1186 }], 1190 }],
1187 ] 1191 ]
1188 }], 1192 }],
1189 ], 1193 ],
1190 }, 1194 },
1191 ], 1195 ],
1192 } 1196 }
OLDNEW
« no previous file with comments | « no previous file | skia/skia_library.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698