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

Unified 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: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/chrome_exe.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/linux/system.gyp
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index 09ee713634dec18e4cb2b8d842b66d7715ce6d81..8a27c207ddc7fcdc2cf0575afedb0cc89abcc7f5 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -658,6 +658,46 @@
},
],
}],
+ ['use_pango==1 and use_cairo==1', {
+ 'targets': [
+ {
+ 'target_name': 'pangocairo',
+ 'type': 'none',
Nico 2015/01/13 22:55:50 Please keep the target available unconditionally,
sfunkenhauser-google 2015/01/14 17:13:58 Done.
+ 'toolsets': ['host', 'target'],
+ 'conditions': [
+ ['_toolset=="target"', {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(<(pkg-config) --cflags pangocairo pangoft2)',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other pangocairo pangoft2)',
+ ],
+ 'libraries': [
+ '<!@(<(pkg-config) --libs-only-l pangocairo pangoft2)',
+ ],
+ },
+ }, {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(pkg-config --cflags pangocairo pangoft2)',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(pkg-config --libs-only-L --libs-only-other pangocairo pangoft2)',
+ ],
+ 'libraries': [
+ '<!@(pkg-config --libs-only-l pangocairo pangoft2)',
+ ],
+ },
+ }],
+ ],
+ },
+ ],
+ }],
], # conditions
'targets': [
{
@@ -1106,42 +1146,6 @@
],
},
{
- 'target_name': 'pangocairo',
- 'type': 'none',
- 'toolsets': ['host', 'target'],
- 'conditions': [
- ['_toolset=="target"', {
- 'direct_dependent_settings': {
- 'cflags': [
- '<!@(<(pkg-config) --cflags pangocairo pangoft2)',
- ],
- },
- 'link_settings': {
- 'ldflags': [
- '<!@(<(pkg-config) --libs-only-L --libs-only-other pangocairo pangoft2)',
- ],
- 'libraries': [
- '<!@(<(pkg-config) --libs-only-l pangocairo pangoft2)',
- ],
- },
- }, {
- 'direct_dependent_settings': {
- 'cflags': [
- '<!@(pkg-config --cflags pangocairo pangoft2)',
- ],
- },
- 'link_settings': {
- 'ldflags': [
- '<!@(pkg-config --libs-only-L --libs-only-other pangocairo pangoft2)',
- ],
- 'libraries': [
- '<!@(pkg-config --libs-only-l pangocairo pangoft2)',
- ],
- },
- }],
- ],
- },
- {
'target_name': 'ssl',
'type': 'none',
'conditions': [
« no previous file with comments | « no previous file | chrome/chrome_exe.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698