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

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

Issue 9649022: linux: Explicitly include gmodule-2.0 in the list for glib/gtk dependency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 9 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 | « no previous file | 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) 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 'conditions': [ 6 'conditions': [
7 ['sysroot!=""', { 7 ['sysroot!=""', {
8 'variables': { 8 'variables': {
9 'pkg-config': './pkg-config-wrapper "<(sysroot)" "<(target_arch)"', 9 'pkg-config': './pkg-config-wrapper "<(sysroot)" "<(target_arch)"',
10 }, 10 },
(...skipping 14 matching lines...) Expand all
25 }, 25 },
26 }], 26 }],
27 ], 27 ],
28 28
29 29
30 'targets': [ 30 'targets': [
31 { 31 {
32 'target_name': 'gtk', 32 'target_name': 'gtk',
33 'type': 'none', 33 'type': 'none',
34 'toolsets': ['host', 'target'], 34 'toolsets': ['host', 'target'],
35 'variables': {
36 # gtk requires gmodule, but it does not list it as a dependency in some
37 # misconfigured systems.
38 'gtk_packages': 'gmodule-2.0 gtk+-2.0 gthread-2.0',
39 },
35 'conditions': [ 40 'conditions': [
36 ['_toolset=="target"', { 41 ['_toolset=="target"', {
37 'direct_dependent_settings': { 42 'direct_dependent_settings': {
38 'cflags': [ 43 'cflags': [
39 '<!@(<(pkg-config) --cflags gtk+-2.0 gthread-2.0)', 44 '<!@(<(pkg-config) --cflags <(gtk_packages))',
40 ], 45 ],
41 }, 46 },
42 'link_settings': { 47 'link_settings': {
43 'ldflags': [ 48 'ldflags': [
44 '<!@(<(pkg-config) --libs-only-L --libs-only-other gtk+-2.0 gthrea d-2.0)', 49 '<!@(<(pkg-config) --libs-only-L --libs-only-other <(gtk_packages) )',
45 ], 50 ],
46 'libraries': [ 51 'libraries': [
47 '<!@(<(pkg-config) --libs-only-l gtk+-2.0 gthread-2.0)', 52 '<!@(<(pkg-config) --libs-only-l <(gtk_packages))',
48 ], 53 ],
49 }, 54 },
50 }, { 55 }, {
51 'direct_dependent_settings': { 56 'direct_dependent_settings': {
52 'cflags': [ 57 'cflags': [
53 '<!@(pkg-config --cflags gtk+-2.0 gthread-2.0)', 58 '<!@(pkg-config --cflags <(gtk_packages))',
54 ], 59 ],
55 }, 60 },
56 'link_settings': { 61 'link_settings': {
57 'ldflags': [ 62 'ldflags': [
58 '<!@(pkg-config --libs-only-L --libs-only-other gtk+-2.0 gthread-2 .0)', 63 '<!@(pkg-config --libs-only-L --libs-only-other <(gtk_packages))',
59 ], 64 ],
60 'libraries': [ 65 'libraries': [
61 '<!@(pkg-config --libs-only-l gtk+-2.0 gthread-2.0)', 66 '<!@(pkg-config --libs-only-l <(gtk_packages))',
62 ], 67 ],
63 }, 68 },
64 }], 69 }],
65 ['chromeos==1', { 70 ['chromeos==1', {
66 'link_settings': { 71 'link_settings': {
67 'libraries': [ '-lXtst' ] 72 'libraries': [ '-lXtst' ]
68 } 73 }
69 }], 74 }],
70 ], 75 ],
71 }, 76 },
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 ], 492 ],
488 'libraries': [ 493 'libraries': [
489 '<!@(<(pkg-config) --libs-only-l dbus-glib-1)', 494 '<!@(<(pkg-config) --libs-only-l dbus-glib-1)',
490 ], 495 ],
491 }, 496 },
492 }, 497 },
493 { 498 {
494 'target_name': 'glib', 499 'target_name': 'glib',
495 'type': 'none', 500 'type': 'none',
496 'toolsets': ['host', 'target'], 501 'toolsets': ['host', 'target'],
502 'variables': {
503 'glib_packages': 'glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0',
504 },
497 'conditions': [ 505 'conditions': [
498 ['_toolset=="target"', { 506 ['_toolset=="target"', {
499 'direct_dependent_settings': { 507 'direct_dependent_settings': {
500 'cflags': [ 508 'cflags': [
501 '<!@(<(pkg-config) --cflags glib-2.0 gobject-2.0 gthread-2.0)', 509 '<!@(<(pkg-config) --cflags <(glib_packages))',
502 ], 510 ],
503 }, 511 },
504 'link_settings': { 512 'link_settings': {
505 'ldflags': [ 513 'ldflags': [
506 '<!@(<(pkg-config) --libs-only-L --libs-only-other glib-2.0 gobjec t-2.0 gthread-2.0)', 514 '<!@(<(pkg-config) --libs-only-L --libs-only-other <(glib_packages ))',
507 ], 515 ],
508 'libraries': [ 516 'libraries': [
509 '<!@(<(pkg-config) --libs-only-l glib-2.0 gobject-2.0 gthread-2.0) ', 517 '<!@(<(pkg-config) --libs-only-l <(glib_packages))',
510 ], 518 ],
511 }, 519 },
512 }, { 520 }, {
513 'direct_dependent_settings': { 521 'direct_dependent_settings': {
514 'cflags': [ 522 'cflags': [
515 '<!@(pkg-config --cflags glib-2.0 gobject-2.0 gthread-2.0)', 523 '<!@(pkg-config --cflags <(glib_packages))',
516 ], 524 ],
517 }, 525 },
518 'link_settings': { 526 'link_settings': {
519 'ldflags': [ 527 'ldflags': [
520 '<!@(pkg-config --libs-only-L --libs-only-other glib-2.0 gobject-2 .0 gthread-2.0)', 528 '<!@(pkg-config --libs-only-L --libs-only-other <(glib_packages))' ,
521 ], 529 ],
522 'libraries': [ 530 'libraries': [
523 '<!@(pkg-config --libs-only-l glib-2.0 gobject-2.0 gthread-2.0)', 531 '<!@(pkg-config --libs-only-l <(glib_packages))',
524 ], 532 ],
525 }, 533 },
526 }], 534 }],
527 ['chromeos==1', { 535 ['chromeos==1', {
528 'link_settings': { 536 'link_settings': {
529 'libraries': [ '-lXtst' ] 537 'libraries': [ '-lXtst' ]
530 } 538 }
531 }], 539 }],
532 ], 540 ],
533 }, 541 },
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
642 ], 650 ],
643 'libraries': [ 651 'libraries': [
644 '<!@(<(pkg-config) --libs-only-l libudev)', 652 '<!@(<(pkg-config) --libs-only-l libudev)',
645 ], 653 ],
646 }, 654 },
647 }], 655 }],
648 ], 656 ],
649 }, 657 },
650 ], 658 ],
651 } 659 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698