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

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

Issue 199016: linux: improve support for cross-compiling (Closed)
Patch Set: Address review comments 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
« no previous file with comments | « build/linux/rewrite_dirs.py ('k') | no next file » | 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) 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' : {
7 'includes': [
8 '../common.gypi',
9 ],
10 'conditions': [
11 ['sysroot!=""', {
12 'pkg-config': './pkg-config-wrapper "<(sysroot)"',
13 }, {
14 'pkg-config': 'pkg-config'
15 }],
16 ],
17 },
6 'targets': [ 18 'targets': [
7 { 19 {
8 'target_name': 'gtk', 20 'target_name': 'gtk',
9 'type': 'settings', 21 'type': 'settings',
10 'direct_dependent_settings': { 22 'direct_dependent_settings': {
11 'cflags': [ 23 'cflags': [
12 '<!@(pkg-config --cflags gtk+-2.0 gthread-2.0)', 24 '<!@(<(pkg-config) --cflags gtk+-2.0 gthread-2.0)',
13 ], 25 ],
14 }, 26 },
15 'link_settings': { 27 'link_settings': {
16 'ldflags': [ 28 'ldflags': [
17 '<!@(pkg-config --libs-only-L --libs-only-other gtk+-2.0 gthread-2.0)' , 29 '<!@(<(pkg-config) --libs-only-L --libs-only-other gtk+-2.0 gthread-2. 0)',
18 ], 30 ],
19 'libraries': [ 31 'libraries': [
20 '<!@(pkg-config --libs-only-l gtk+-2.0 gthread-2.0)', 32 '<!@(<(pkg-config) --libs-only-l gtk+-2.0 gthread-2.0)',
21 ], 33 ],
22 }, 34 },
23 }, 35 },
24 { 36 {
25 'target_name': 'nss', 37 'target_name': 'nss',
26 'type': 'settings', 38 'type': 'settings',
27 'direct_dependent_settings': { 39 'direct_dependent_settings': {
28 'cflags': [ 40 'cflags': [
29 '<!@(pkg-config --cflags nss)', 41 '<!@(<(pkg-config) --cflags nss)',
30 ], 42 ],
31 }, 43 },
32 'link_settings': { 44 'link_settings': {
33 'ldflags': [ 45 'ldflags': [
34 '<!@(pkg-config --libs-only-L --libs-only-other nss)', 46 '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)',
35 ], 47 ],
36 'libraries': [ 48 'libraries': [
37 '<!@(pkg-config --libs-only-l nss)', 49 '<!@(<(pkg-config) --libs-only-l nss)',
38 ], 50 ],
39 }, 51 },
40 }, 52 },
41 { 53 {
42 'target_name': 'freetype2', 54 'target_name': 'freetype2',
43 'type': 'settings', 55 'type': 'settings',
44 'direct_dependent_settings': { 56 'direct_dependent_settings': {
45 'cflags': [ 57 'cflags': [
46 '<!@(pkg-config --cflags freetype2)', 58 '<!@(<(pkg-config) --cflags freetype2)',
47 ], 59 ],
48 }, 60 },
49 'link_settings': { 61 'link_settings': {
50 'ldflags': [ 62 'ldflags': [
51 '<!@(pkg-config --libs-only-L --libs-only-other freetype2)', 63 '<!@(<(pkg-config) --libs-only-L --libs-only-other freetype2)',
52 ], 64 ],
53 'libraries': [ 65 'libraries': [
54 '<!@(pkg-config --libs-only-l freetype2)', 66 '<!@(<(pkg-config) --libs-only-l freetype2)',
55 ], 67 ],
56 }, 68 },
57 }, 69 },
58 { 70 {
59 'target_name': 'fontconfig', 71 'target_name': 'fontconfig',
60 'type': 'settings', 72 'type': 'settings',
61 'direct_dependent_settings': { 73 'direct_dependent_settings': {
62 'cflags': [ 74 'cflags': [
63 '<!@(pkg-config --cflags fontconfig)', 75 '<!@(<(pkg-config) --cflags fontconfig)',
64 ], 76 ],
65 }, 77 },
66 'link_settings': { 78 'link_settings': {
67 'ldflags': [ 79 'ldflags': [
68 '<!@(pkg-config --libs-only-L --libs-only-other fontconfig)', 80 '<!@(<(pkg-config) --libs-only-L --libs-only-other fontconfig)',
69 ], 81 ],
70 'libraries': [ 82 'libraries': [
71 '<!@(pkg-config --libs-only-l fontconfig)', 83 '<!@(<(pkg-config) --libs-only-l fontconfig)',
72 ], 84 ],
73 }, 85 },
74 }, 86 },
75 { 87 {
76 'target_name': 'gdk', 88 'target_name': 'gdk',
77 'type': 'settings', 89 'type': 'settings',
78 'direct_dependent_settings': { 90 'direct_dependent_settings': {
79 'cflags': [ 91 'cflags': [
80 '<!@(pkg-config --cflags gdk-2.0)', 92 '<!@(<(pkg-config) --cflags gdk-2.0)',
81 ], 93 ],
82 }, 94 },
83 'link_settings': { 95 'link_settings': {
84 'ldflags': [ 96 'ldflags': [
85 '<!@(pkg-config --libs-only-L --libs-only-other gdk-2.0)', 97 '<!@(<(pkg-config) --libs-only-L --libs-only-other gdk-2.0)',
86 ], 98 ],
87 'libraries': [ 99 'libraries': [
88 '<!@(pkg-config --libs-only-l gdk-2.0)', 100 '<!@(<(pkg-config) --libs-only-l gdk-2.0)',
89 ], 101 ],
90 }, 102 },
91 }, 103 },
92 { 104 {
93 'target_name': 'gconf', 105 'target_name': 'gconf',
94 'type': 'settings', 106 'type': 'settings',
95 'direct_dependent_settings': { 107 'direct_dependent_settings': {
96 'cflags': [ 108 'cflags': [
97 '<!@(pkg-config --cflags gconf-2.0)', 109 '<!@(<(pkg-config) --cflags gconf-2.0)',
98 ], 110 ],
99 }, 111 },
100 'link_settings': { 112 'link_settings': {
101 'ldflags': [ 113 'ldflags': [
102 '<!@(pkg-config --libs-only-L --libs-only-other gconf-2.0)', 114 '<!@(<(pkg-config) --libs-only-L --libs-only-other gconf-2.0)',
103 ], 115 ],
104 'libraries': [ 116 'libraries': [
105 '<!@(pkg-config --libs-only-l gconf-2.0)', 117 '<!@(<(pkg-config) --libs-only-l gconf-2.0)',
106 ], 118 ],
107 }, 119 },
108 }, 120 },
109 { 121 {
110 'target_name': 'x11', 122 'target_name': 'x11',
111 'type': 'settings', 123 'type': 'settings',
112 'direct_dependent_settings': { 124 'direct_dependent_settings': {
113 'cflags': [ 125 'cflags': [
114 '<!@(pkg-config --cflags x11)', 126 '<!@(<(pkg-config) --cflags x11)',
115 ], 127 ],
116 }, 128 },
117 'link_settings': { 129 'link_settings': {
118 'ldflags': [ 130 'ldflags': [
119 '<!@(pkg-config --libs-only-L --libs-only-other x11)', 131 '<!@(<(pkg-config) --libs-only-L --libs-only-other x11)',
120 ], 132 ],
121 'libraries': [ 133 'libraries': [
122 '<!@(pkg-config --libs-only-l x11)', 134 '<!@(<(pkg-config) --libs-only-l x11)',
123 ], 135 ],
124 }, 136 },
125 }, 137 },
126 # TODO(evanm): temporarily disabled while we figure out whether to depend 138 # TODO(evanm): temporarily disabled while we figure out whether to depend
127 # on gnome-keyring etc. 139 # on gnome-keyring etc.
128 # http://code.google.com/p/chromium/issues/detail?id=12351 140 # http://code.google.com/p/chromium/issues/detail?id=12351
129 # { 141 # {
130 # 'target_name': 'gnome-keyring', 142 # 'target_name': 'gnome-keyring',
131 # 'type': 'settings', 143 # 'type': 'settings',
132 # 'direct_dependent_settings': { 144 # 'direct_dependent_settings': {
133 # 'cflags': [ 145 # 'cflags': [
134 # '<!@(pkg-config --cflags gnome-keyring-1)', 146 # '<!@(<(pkg-config) --cflags gnome-keyring-1)',
135 # ], 147 # ],
136 # }, 148 # },
137 # 'link_settings': { 149 # 'link_settings': {
138 # 'ldflags': [ 150 # 'ldflags': [
139 # '<!@(pkg-config --libs-only-L --libs-only-other gnome-keyring-1)', 151 # '<!@(<(pkg-config) --libs-only-L --libs-only-other gnome-keyring-1)' ,
140 # ], 152 # ],
141 # 'libraries': [ 153 # 'libraries': [
142 # '<!@(pkg-config --libs-only-l gnome-keyring-1)', 154 # '<!@(<(pkg-config) --libs-only-l gnome-keyring-1)',
143 # ], 155 # ],
144 # }, 156 # },
145 # }, 157 # },
146 # { 158 # {
147 # 'target_name': 'dbus-glib', 159 # 'target_name': 'dbus-glib',
148 # 'type': 'settings', 160 # 'type': 'settings',
149 # 'direct_dependent_settings': { 161 # 'direct_dependent_settings': {
150 # 'cflags': [ 162 # 'cflags': [
151 # '<!@(pkg-config --cflags dbus-glib-1)', 163 # '<!@(<(pkg-config) --cflags dbus-glib-1)',
152 # ], 164 # ],
153 # }, 165 # },
154 # 'link_settings': { 166 # 'link_settings': {
155 # 'ldflags': [ 167 # 'ldflags': [
156 # '<!@(pkg-config --libs-only-L --libs-only-other dbus-glib-1)', 168 # '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-glib-1)',
157 # ], 169 # ],
158 # 'libraries': [ 170 # 'libraries': [
159 # '<!@(pkg-config --libs-only-l dbus-glib-1)', 171 # '<!@(<(pkg-config) --libs-only-l dbus-glib-1)',
160 # ], 172 # ],
161 # }, 173 # },
162 # }, 174 # },
163 ], 175 ],
164 } 176 }
OLDNEW
« no previous file with comments | « build/linux/rewrite_dirs.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698