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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/linux/system.gyp

Issue 29363008: Reorder dependencies based on target_name. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 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 | no next file » | 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 d31172843daacc7efa1ca747f00b66a678500a45..0f294223936461f6f69ee4954e86b34a63915cd9 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -34,6 +34,27 @@
# added back to Chrome OS. Don't try to use GTK on Chrome OS.
'targets': [
{
+ 'target_name': 'gdk',
+ 'type': 'none',
+ 'conditions': [
+ ['_toolset=="target"', {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(<(pkg-config) --cflags gdk-2.0)',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other gdk-2.0)',
+ ],
+ 'libraries': [
+ '<!@(<(pkg-config) --libs-only-l gdk-2.0)',
+ ],
+ },
+ }],
+ ],
+ },
+ {
'target_name': 'gtk',
'type': 'none',
'toolsets': ['host', 'target'],
@@ -95,133 +116,78 @@
}],
],
},
- {
- 'target_name': 'gdk',
- 'type': 'none',
- 'conditions': [
- ['_toolset=="target"', {
- 'direct_dependent_settings': {
- 'cflags': [
- '<!@(<(pkg-config) --cflags gdk-2.0)',
- ],
- },
- 'link_settings': {
- 'ldflags': [
- '<!@(<(pkg-config) --libs-only-L --libs-only-other gdk-2.0)',
- ],
- 'libraries': [
- '<!@(<(pkg-config) --libs-only-l gdk-2.0)',
- ],
- },
- }],
- ],
- },
], # targets
}],
], # conditions
'targets': [
{
- 'target_name': 'ssl',
+ 'target_name': 'dbus',
'type': 'none',
- 'conditions': [
- ['_toolset=="target"', {
- 'conditions': [
- ['use_openssl==1', {
- 'dependencies': [
- '../../third_party/openssl/openssl.gyp:openssl',
- ],
- }],
- ['use_openssl==0 and use_system_ssl==0', {
- 'dependencies': [
- '../../net/third_party/nss/ssl.gyp:libssl',
- ],
- 'direct_dependent_settings': {
- 'include_dirs+': [
- # We need for our local copies of the libssl3 headers to come
- # before other includes, as we are shadowing system headers.
- '<(DEPTH)/net/third_party/nss/ssl',
- ],
- 'cflags': [
- '<!@(<(pkg-config) --cflags nss)',
- ],
- },
- 'link_settings': {
- 'ldflags': [
- '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)',
- ],
- 'libraries': [
- '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")',
- ],
- },
- }],
- ['use_openssl==0 and use_system_ssl==1', {
- 'direct_dependent_settings': {
- 'cflags': [
- '<!@(<(pkg-config) --cflags nss)',
- ],
- 'defines': [
- 'USE_SYSTEM_SSL',
- ],
- },
- 'link_settings': {
- 'ldflags': [
- '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)',
- ],
- 'libraries': [
- '<!@(<(pkg-config) --libs-only-l nss)',
- ],
- },
- }],
- ['use_openssl==0 and clang==1', {
- 'direct_dependent_settings': {
- 'cflags': [
- # There is a broken header guard in /usr/include/nss/secmod.h:
- # https://bugzilla.mozilla.org/show_bug.cgi?id=884072
- '-Wno-header-guard',
- ],
- },
- }],
- ]
- }],
- ],
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(<(pkg-config) --cflags dbus-1)',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-1)',
+ ],
+ 'libraries': [
+ '<!@(<(pkg-config) --libs-only-l dbus-1)',
+ ],
+ },
},
{
- 'target_name': 'freetype2',
+ 'target_name': 'dridrm',
+ 'type': 'none',
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(<(pkg-config) --cflags libdrm)',
+ ],
+ },
+ 'link_settings': {
+ 'libraries': [
+ '<!@(<(pkg-config) --libs-only-l libdrm)',
+ ],
+ },
+ },
+ {
+ 'target_name': 'fontconfig',
'type': 'none',
'conditions': [
['_toolset=="target"', {
'direct_dependent_settings': {
'cflags': [
- '<!@(<(pkg-config) --cflags freetype2)',
+ '<!@(<(pkg-config) --cflags fontconfig)',
],
},
'link_settings': {
'ldflags': [
- '<!@(<(pkg-config) --libs-only-L --libs-only-other freetype2)',
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other fontconfig)',
],
'libraries': [
- '<!@(<(pkg-config) --libs-only-l freetype2)',
+ '<!@(<(pkg-config) --libs-only-l fontconfig)',
],
},
}],
],
},
{
- 'target_name': 'fontconfig',
+ 'target_name': 'freetype2',
'type': 'none',
'conditions': [
['_toolset=="target"', {
'direct_dependent_settings': {
'cflags': [
- '<!@(<(pkg-config) --cflags fontconfig)',
+ '<!@(<(pkg-config) --cflags freetype2)',
],
},
'link_settings': {
'ldflags': [
- '<!@(<(pkg-config) --libs-only-L --libs-only-other fontconfig)',
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other freetype2)',
],
'libraries': [
- '<!@(<(pkg-config) --libs-only-l fontconfig)',
+ '<!@(<(pkg-config) --libs-only-l freetype2)',
],
},
}],
@@ -327,146 +293,123 @@
],
},
{
- 'target_name': 'libpci',
- 'type': 'static_library',
- 'cflags': [
- '<!@(<(pkg-config) --cflags libpci)',
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '<(SHARED_INTERMEDIATE_DIR)',
- ],
- 'conditions': [
- ['linux_link_libpci==1', {
- 'link_settings': {
- 'ldflags': [
- '<!@(<(pkg-config) --libs-only-L --libs-only-other libpci)',
- ],
- 'libraries': [
- '<!@(<(pkg-config) --libs-only-l libpci)',
- ],
- }
- }],
- ],
+ 'target_name': 'glib',
+ 'type': 'none',
+ 'toolsets': ['host', 'target'],
+ 'variables': {
+ 'glib_packages': 'glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0',
},
- 'include_dirs': [
- '../..',
- ],
- 'hard_dependency': 1,
- 'actions': [
- {
- 'variables': {
- 'output_h': '<(SHARED_INTERMEDIATE_DIR)/library_loaders/libpci.h',
- 'output_cc': '<(INTERMEDIATE_DIR)/libpci_loader.cc',
- 'generator': '../../tools/generate_library_loader/generate_library_loader.py',
+ 'conditions': [
+ ['_toolset=="target"', {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(<(pkg-config) --cflags <(glib_packages))',
+ ],
},
- 'action_name': 'generate_libpci_loader',
- 'inputs': [
- '<(generator)',
- ],
- 'outputs': [
- '<(output_h)',
- '<(output_cc)',
- ],
- 'action': ['python',
- '<(generator)',
- '--name', 'LibPciLoader',
- '--output-h', '<(output_h)',
- '--output-cc', '<(output_cc)',
- '--header', '<pci/pci.h>',
- # TODO(phajdan.jr): Report problem to pciutils project
- # and get it fixed so that we don't need --use-extern-c.
- '--use-extern-c',
- '--link-directly=<(linux_link_libpci)',
- 'pci_alloc',
- 'pci_init',
- 'pci_cleanup',
- 'pci_scan_bus',
- 'pci_fill_info',
- 'pci_lookup_name',
- ],
- 'message': 'Generating libpci library loader.',
- 'process_outputs_as_sources': 1,
- },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other <(glib_packages))',
+ ],
+ 'libraries': [
+ '<!@(<(pkg-config) --libs-only-l <(glib_packages))',
+ ],
+ },
+ }, {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(pkg-config --cflags <(glib_packages))',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(pkg-config --libs-only-L --libs-only-other <(glib_packages))',
+ ],
+ 'libraries': [
+ '<!@(pkg-config --libs-only-l <(glib_packages))',
+ ],
+ },
+ }],
+ ['use_x11==1', {
+ 'link_settings': {
+ 'libraries': [ '-lXtst' ]
+ }
+ }],
],
},
{
- 'target_name': 'libspeechd',
- 'type': 'static_library',
- 'direct_dependent_settings': {
- 'include_dirs': [
- '<(SHARED_INTERMEDIATE_DIR)',
- ],
- 'conditions': [
- ['linux_link_libspeechd==1', {
- 'link_settings': {
- 'libraries': [
- '-lspeechd',
+ 'target_name': 'gnome_keyring',
+ 'type': 'none',
+ 'conditions': [
+ ['use_gnome_keyring==1', {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(<(pkg-config) --cflags gnome-keyring-1)',
+ ],
+ 'defines': [
+ 'USE_GNOME_KEYRING',
+ ],
+ 'conditions': [
+ ['linux_link_gnome_keyring==0', {
+ 'defines': ['DLOPEN_GNOME_KEYRING'],
+ }],
+ ],
+ },
+ 'conditions': [
+ ['linux_link_gnome_keyring!=0', {
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other gnome-keyring-1)',
+ ],
+ 'libraries': [
+ '<!@(<(pkg-config) --libs-only-l gnome-keyring-1)',
+ ],
+ },
+ }, {
+ 'conditions': [
+ ['OS=="linux"', {
+ 'link_settings': {
+ 'libraries': [
+ '-ldl',
+ ],
+ },
+ }],
],
- }
- }],
- ],
- },
- 'include_dirs': [
- '../..',
+ }],
+ ],
+ }],
],
- 'hard_dependency': 1,
- 'actions': [
- {
- 'variables': {
- 'output_h': '<(SHARED_INTERMEDIATE_DIR)/library_loaders/libspeechd.h',
- 'output_cc': '<(INTERMEDIATE_DIR)/libspeechd_loader.cc',
- 'generator': '../../tools/generate_library_loader/generate_library_loader.py',
-
- # speech-dispatcher >= 0.8 installs libspeechd.h into
- # speech-dispatcher/libspeechd.h, whereas speech-dispatcher < 0.8
- # puts libspeechd.h in the top-level include directory.
- # Since we need to support both cases for now, we ship a copy of
- # libspeechd.h in third_party/speech-dispatcher. If the user
- # prefers to link against the speech-dispatcher directly, the
- # `libspeechd_h_prefix' variable can be passed to gyp with a value
- # such as "speech-dispatcher/" that will be prepended to
- # "libspeechd.h" in the #include directive.
- # TODO(phaldan.jr): Once we do not need to support
- # speech-dispatcher < 0.8 we can get rid of all this (including
- # third_party/speech-dispatcher) and just include
- # speech-dispatcher/libspeechd.h unconditionally.
- 'libspeechd_h_prefix%': '',
+ },
+ {
+ # The unit tests use a few convenience functions from the GNOME
+ # Keyring library directly. We ignore linux_link_gnome_keyring and
+ # link directly in this version of the target to allow this.
+ # *** Do not use this target in the main binary! ***
+ 'target_name': 'gnome_keyring_direct',
+ 'type': 'none',
+ 'conditions': [
+ ['use_gnome_keyring==1', {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(<(pkg-config) --cflags gnome-keyring-1)',
+ ],
+ 'defines': [
+ 'USE_GNOME_KEYRING',
+ ],
+ 'conditions': [
+ ['linux_link_gnome_keyring==0', {
+ 'defines': ['DLOPEN_GNOME_KEYRING'],
+ }],
+ ],
},
- 'action_name': 'generate_libspeechd_loader',
- 'inputs': [
- '<(generator)',
- ],
- 'outputs': [
- '<(output_h)',
- '<(output_cc)',
- ],
- 'action': ['python',
- '<(generator)',
- '--name', 'LibSpeechdLoader',
- '--output-h', '<(output_h)',
- '--output-cc', '<(output_cc)',
- '--header', '<<(libspeechd_h_prefix)libspeechd.h>',
- '--bundled-header',
- '"third_party/speech-dispatcher/libspeechd.h"',
- '--link-directly=<(linux_link_libspeechd)',
- 'spd_open',
- 'spd_say',
- 'spd_stop',
- 'spd_close',
- 'spd_pause',
- 'spd_resume',
- 'spd_set_notification_on',
- 'spd_set_voice_rate',
- 'spd_set_voice_pitch',
- 'spd_list_synthesis_voices',
- 'spd_set_synthesis_voice',
- 'spd_list_modules',
- 'spd_set_output_module',
- ],
- 'message': 'Generating libspeechd library loader.',
- 'process_outputs_as_sources': 1,
- },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other gnome-keyring-1)',
+ ],
+ 'libraries': [
+ '<!@(<(pkg-config) --libs-only-l gnome-keyring-1)',
+ ],
+ },
+ }],
],
},
{
@@ -534,354 +477,411 @@
],
},
{
- 'target_name': 'x11',
+ 'target_name': 'libgcrypt',
'type': 'none',
- 'toolsets': ['host', 'target'],
'conditions': [
- ['_toolset=="target"', {
- 'direct_dependent_settings': {
- 'cflags': [
- '<!@(<(pkg-config) --cflags x11)',
- ],
- },
- 'link_settings': {
- 'ldflags': [
- '<!@(<(pkg-config) --libs-only-L --libs-only-other x11 xi)',
- ],
- 'libraries': [
- '<!@(<(pkg-config) --libs-only-l x11 xi)',
- ],
- },
- }, {
+ ['_toolset=="target" and use_cups==1', {
'direct_dependent_settings': {
'cflags': [
- '<!@(pkg-config --cflags x11)',
+ '<!@(libgcrypt-config --cflags)',
],
},
'link_settings': {
- 'ldflags': [
- '<!@(pkg-config --libs-only-L --libs-only-other x11 xi)',
- ],
'libraries': [
- '<!@(pkg-config --libs-only-l x11 xi)',
+ '<!@(libgcrypt-config --libs)',
],
},
}],
],
},
{
- 'target_name': 'xext',
- 'type': 'none',
- 'conditions': [
- ['_toolset=="target"', {
- 'direct_dependent_settings': {
- 'cflags': [
- '<!@(<(pkg-config) --cflags xext)',
- ],
- },
- 'link_settings': {
- 'ldflags': [
- '<!@(<(pkg-config) --libs-only-L --libs-only-other xext)',
- ],
- 'libraries': [
- '<!@(<(pkg-config) --libs-only-l xext)',
- ],
+ 'target_name': 'libpci',
+ 'type': 'static_library',
+ 'cflags': [
+ '<!@(<(pkg-config) --cflags libpci)',
+ ],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '<(SHARED_INTERMEDIATE_DIR)',
+ ],
+ 'conditions': [
+ ['linux_link_libpci==1', {
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other libpci)',
+ ],
+ 'libraries': [
+ '<!@(<(pkg-config) --libs-only-l libpci)',
+ ],
+ }
+ }],
+ ],
+ },
+ 'include_dirs': [
+ '../..',
+ ],
+ 'hard_dependency': 1,
+ 'actions': [
+ {
+ 'variables': {
+ 'output_h': '<(SHARED_INTERMEDIATE_DIR)/library_loaders/libpci.h',
+ 'output_cc': '<(INTERMEDIATE_DIR)/libpci_loader.cc',
+ 'generator': '../../tools/generate_library_loader/generate_library_loader.py',
},
- }],
+ 'action_name': 'generate_libpci_loader',
+ 'inputs': [
+ '<(generator)',
+ ],
+ 'outputs': [
+ '<(output_h)',
+ '<(output_cc)',
+ ],
+ 'action': ['python',
+ '<(generator)',
+ '--name', 'LibPciLoader',
+ '--output-h', '<(output_h)',
+ '--output-cc', '<(output_cc)',
+ '--header', '<pci/pci.h>',
+ # TODO(phajdan.jr): Report problem to pciutils project
+ # and get it fixed so that we don't need --use-extern-c.
+ '--use-extern-c',
+ '--link-directly=<(linux_link_libpci)',
+ 'pci_alloc',
+ 'pci_init',
+ 'pci_cleanup',
+ 'pci_scan_bus',
+ 'pci_fill_info',
+ 'pci_lookup_name',
+ ],
+ 'message': 'Generating libpci library loader.',
+ 'process_outputs_as_sources': 1,
+ },
],
},
{
- 'target_name': 'xfixes',
+ 'target_name': 'libresolv',
'type': 'none',
- 'conditions': [
- ['_toolset=="target"', {
- 'direct_dependent_settings': {
- 'cflags': [
- '<!@(<(pkg-config) --cflags xfixes)',
- ],
- },
- 'link_settings': {
- 'ldflags': [
- '<!@(<(pkg-config) --libs-only-L --libs-only-other xfixes)',
- ],
- 'libraries': [
- '<!@(<(pkg-config) --libs-only-l xfixes)',
- ],
+ 'link_settings': {
+ 'libraries': [
+ '-lresolv',
+ ],
+ },
+ },
+ {
+ 'target_name': 'libspeechd',
+ 'type': 'static_library',
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '<(SHARED_INTERMEDIATE_DIR)',
+ ],
+ 'conditions': [
+ ['linux_link_libspeechd==1', {
+ 'link_settings': {
+ 'libraries': [
+ '-lspeechd',
+ ],
+ }
+ }],
+ ],
+ },
+ 'include_dirs': [
+ '../..',
+ ],
+ 'hard_dependency': 1,
+ 'actions': [
+ {
+ 'variables': {
+ 'output_h': '<(SHARED_INTERMEDIATE_DIR)/library_loaders/libspeechd.h',
+ 'output_cc': '<(INTERMEDIATE_DIR)/libspeechd_loader.cc',
+ 'generator': '../../tools/generate_library_loader/generate_library_loader.py',
+
+ # speech-dispatcher >= 0.8 installs libspeechd.h into
+ # speech-dispatcher/libspeechd.h, whereas speech-dispatcher < 0.8
+ # puts libspeechd.h in the top-level include directory.
+ # Since we need to support both cases for now, we ship a copy of
+ # libspeechd.h in third_party/speech-dispatcher. If the user
+ # prefers to link against the speech-dispatcher directly, the
+ # `libspeechd_h_prefix' variable can be passed to gyp with a value
+ # such as "speech-dispatcher/" that will be prepended to
+ # "libspeechd.h" in the #include directive.
+ # TODO(phaldan.jr): Once we do not need to support
+ # speech-dispatcher < 0.8 we can get rid of all this (including
+ # third_party/speech-dispatcher) and just include
+ # speech-dispatcher/libspeechd.h unconditionally.
+ 'libspeechd_h_prefix%': '',
},
- }],
+ 'action_name': 'generate_libspeechd_loader',
+ 'inputs': [
+ '<(generator)',
+ ],
+ 'outputs': [
+ '<(output_h)',
+ '<(output_cc)',
+ ],
+ 'action': ['python',
+ '<(generator)',
+ '--name', 'LibSpeechdLoader',
+ '--output-h', '<(output_h)',
+ '--output-cc', '<(output_cc)',
+ '--header', '<<(libspeechd_h_prefix)libspeechd.h>',
+ '--bundled-header',
+ '"third_party/speech-dispatcher/libspeechd.h"',
+ '--link-directly=<(linux_link_libspeechd)',
+ 'spd_open',
+ 'spd_say',
+ 'spd_stop',
+ 'spd_close',
+ 'spd_pause',
+ 'spd_resume',
+ 'spd_set_notification_on',
+ 'spd_set_voice_rate',
+ 'spd_set_voice_pitch',
+ 'spd_list_synthesis_voices',
+ 'spd_set_synthesis_voice',
+ 'spd_list_modules',
+ 'spd_set_output_module',
+ ],
+ 'message': 'Generating libspeechd library loader.',
+ 'process_outputs_as_sources': 1,
+ },
],
},
{
- 'target_name': 'xrandr',
+ 'target_name': 'pangocairo',
'type': 'none',
'toolsets': ['host', 'target'],
'conditions': [
['_toolset=="target"', {
'direct_dependent_settings': {
'cflags': [
- '<!@(<(pkg-config) --cflags xrandr)',
+ '<!@(<(pkg-config) --cflags pangocairo pangoft2)',
],
},
'link_settings': {
'ldflags': [
- '<!@(<(pkg-config) --libs-only-L --libs-only-other xrandr)',
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other pangocairo pangoft2)',
],
'libraries': [
- '<!@(<(pkg-config) --libs-only-l xrandr)',
+ '<!@(<(pkg-config) --libs-only-l pangocairo pangoft2)',
],
},
}, {
'direct_dependent_settings': {
'cflags': [
- '<!@(pkg-config --cflags xrandr)',
+ '<!@(pkg-config --cflags pangocairo pangoft2)',
],
},
'link_settings': {
'ldflags': [
- '<!@(pkg-config --libs-only-L --libs-only-other xrandr)',
- ],
- 'libraries': [
- '<!@(pkg-config --libs-only-l xrandr)',
- ],
- },
- }],
- ],
- },
- {
- 'target_name': 'libgcrypt',
- 'type': 'none',
- 'conditions': [
- ['_toolset=="target" and use_cups==1', {
- 'direct_dependent_settings': {
- 'cflags': [
- '<!@(libgcrypt-config --cflags)',
+ '<!@(pkg-config --libs-only-L --libs-only-other pangocairo pangoft2)',
],
- },
- 'link_settings': {
'libraries': [
- '<!@(libgcrypt-config --libs)',
+ '<!@(pkg-config --libs-only-l pangocairo pangoft2)',
],
},
}],
],
},
{
- 'target_name': 'gnome_keyring',
+ 'target_name': 'ssl',
'type': 'none',
'conditions': [
- ['use_gnome_keyring==1', {
- 'direct_dependent_settings': {
- 'cflags': [
- '<!@(<(pkg-config) --cflags gnome-keyring-1)',
- ],
- 'defines': [
- 'USE_GNOME_KEYRING',
- ],
- 'conditions': [
- ['linux_link_gnome_keyring==0', {
- 'defines': ['DLOPEN_GNOME_KEYRING'],
- }],
- ],
- },
+ ['_toolset=="target"', {
'conditions': [
- ['linux_link_gnome_keyring!=0', {
+ ['use_openssl==1', {
+ 'dependencies': [
+ '../../third_party/openssl/openssl.gyp:openssl',
+ ],
+ }],
+ ['use_openssl==0 and use_system_ssl==0', {
+ 'dependencies': [
+ '../../net/third_party/nss/ssl.gyp:libssl',
+ ],
+ 'direct_dependent_settings': {
+ 'include_dirs+': [
+ # We need for our local copies of the libssl3 headers to come
+ # before other includes, as we are shadowing system headers.
+ '<(DEPTH)/net/third_party/nss/ssl',
+ ],
+ 'cflags': [
+ '<!@(<(pkg-config) --cflags nss)',
+ ],
+ },
'link_settings': {
'ldflags': [
- '<!@(<(pkg-config) --libs-only-L --libs-only-other gnome-keyring-1)',
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)',
],
'libraries': [
- '<!@(<(pkg-config) --libs-only-l gnome-keyring-1)',
+ '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")',
],
},
- }, {
- 'conditions': [
- ['OS=="linux"', {
- 'link_settings': {
- 'libraries': [
- '-ldl',
- ],
- },
- }],
- ],
}],
- ],
+ ['use_openssl==0 and use_system_ssl==1', {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(<(pkg-config) --cflags nss)',
+ ],
+ 'defines': [
+ 'USE_SYSTEM_SSL',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)',
+ ],
+ 'libraries': [
+ '<!@(<(pkg-config) --libs-only-l nss)',
+ ],
+ },
+ }],
+ ['use_openssl==0 and clang==1', {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ # There is a broken header guard in /usr/include/nss/secmod.h:
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=884072
+ '-Wno-header-guard',
+ ],
+ },
+ }],
+ ]
}],
],
},
{
- # The unit tests use a few convenience functions from the GNOME
- # Keyring library directly. We ignore linux_link_gnome_keyring and
- # link directly in this version of the target to allow this.
- # *** Do not use this target in the main binary! ***
- 'target_name': 'gnome_keyring_direct',
+ 'target_name': 'udev',
'type': 'none',
'conditions': [
- ['use_gnome_keyring==1', {
+ # libudev is not available on *BSD
+ ['_toolset=="target" and os_bsd!=1', {
'direct_dependent_settings': {
'cflags': [
- '<!@(<(pkg-config) --cflags gnome-keyring-1)',
- ],
- 'defines': [
- 'USE_GNOME_KEYRING',
- ],
- 'conditions': [
- ['linux_link_gnome_keyring==0', {
- 'defines': ['DLOPEN_GNOME_KEYRING'],
- }],
+ '<!@(<(pkg-config) --cflags libudev)'
],
},
'link_settings': {
'ldflags': [
- '<!@(<(pkg-config) --libs-only-L --libs-only-other gnome-keyring-1)',
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other libudev)',
],
'libraries': [
- '<!@(<(pkg-config) --libs-only-l gnome-keyring-1)',
+ '<!@(<(pkg-config) --libs-only-l libudev)',
],
},
}],
],
},
{
- 'target_name': 'dbus',
- 'type': 'none',
- 'direct_dependent_settings': {
- 'cflags': [
- '<!@(<(pkg-config) --cflags dbus-1)',
- ],
- },
- 'link_settings': {
- 'ldflags': [
- '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-1)',
- ],
- 'libraries': [
- '<!@(<(pkg-config) --libs-only-l dbus-1)',
- ],
- },
- },
- {
- 'target_name': 'glib',
+ 'target_name': 'x11',
'type': 'none',
'toolsets': ['host', 'target'],
- 'variables': {
- 'glib_packages': 'glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0',
- },
'conditions': [
['_toolset=="target"', {
'direct_dependent_settings': {
'cflags': [
- '<!@(<(pkg-config) --cflags <(glib_packages))',
+ '<!@(<(pkg-config) --cflags x11)',
],
},
'link_settings': {
'ldflags': [
- '<!@(<(pkg-config) --libs-only-L --libs-only-other <(glib_packages))',
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other x11 xi)',
],
'libraries': [
- '<!@(<(pkg-config) --libs-only-l <(glib_packages))',
+ '<!@(<(pkg-config) --libs-only-l x11 xi)',
],
},
}, {
'direct_dependent_settings': {
'cflags': [
- '<!@(pkg-config --cflags <(glib_packages))',
+ '<!@(pkg-config --cflags x11)',
],
},
'link_settings': {
'ldflags': [
- '<!@(pkg-config --libs-only-L --libs-only-other <(glib_packages))',
+ '<!@(pkg-config --libs-only-L --libs-only-other x11 xi)',
],
'libraries': [
- '<!@(pkg-config --libs-only-l <(glib_packages))',
+ '<!@(pkg-config --libs-only-l x11 xi)',
],
},
}],
- ['use_x11==1', {
- 'link_settings': {
- 'libraries': [ '-lXtst' ]
- }
- }],
],
},
{
- 'target_name': 'pangocairo',
+ 'target_name': 'xext',
'type': 'none',
- 'toolsets': ['host', 'target'],
'conditions': [
['_toolset=="target"', {
'direct_dependent_settings': {
'cflags': [
- '<!@(<(pkg-config) --cflags pangocairo pangoft2)',
+ '<!@(<(pkg-config) --cflags xext)',
],
},
'link_settings': {
'ldflags': [
- '<!@(<(pkg-config) --libs-only-L --libs-only-other pangocairo pangoft2)',
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other xext)',
],
'libraries': [
- '<!@(<(pkg-config) --libs-only-l pangocairo pangoft2)',
+ '<!@(<(pkg-config) --libs-only-l xext)',
],
},
- }, {
+ }],
+ ],
+ },
+ {
+ 'target_name': 'xfixes',
+ 'type': 'none',
+ 'conditions': [
+ ['_toolset=="target"', {
'direct_dependent_settings': {
'cflags': [
- '<!@(pkg-config --cflags pangocairo pangoft2)',
+ '<!@(<(pkg-config) --cflags xfixes)',
],
},
'link_settings': {
'ldflags': [
- '<!@(pkg-config --libs-only-L --libs-only-other pangocairo pangoft2)',
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other xfixes)',
],
'libraries': [
- '<!@(pkg-config --libs-only-l pangocairo pangoft2)',
+ '<!@(<(pkg-config) --libs-only-l xfixes)',
],
},
}],
],
},
{
- 'target_name': 'libresolv',
- 'type': 'none',
- 'link_settings': {
- 'libraries': [
- '-lresolv',
- ],
- },
- },
- {
- 'target_name': 'udev',
+ 'target_name': 'xrandr',
'type': 'none',
+ 'toolsets': ['host', 'target'],
'conditions': [
- # libudev is not available on *BSD
- ['_toolset=="target" and os_bsd!=1', {
+ ['_toolset=="target"', {
'direct_dependent_settings': {
'cflags': [
- '<!@(<(pkg-config) --cflags libudev)'
+ '<!@(<(pkg-config) --cflags xrandr)',
],
},
'link_settings': {
'ldflags': [
- '<!@(<(pkg-config) --libs-only-L --libs-only-other libudev)',
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other xrandr)',
],
'libraries': [
- '<!@(<(pkg-config) --libs-only-l libudev)',
+ '<!@(<(pkg-config) --libs-only-l xrandr)',
+ ],
+ },
+ }, {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(pkg-config --cflags xrandr)',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(pkg-config --libs-only-L --libs-only-other xrandr)',
+ ],
+ 'libraries': [
+ '<!@(pkg-config --libs-only-l xrandr)',
],
},
}],
],
},
- {
- 'target_name': 'dridrm',
- 'type': 'none',
- 'direct_dependent_settings': {
- 'cflags': [
- '<!@(<(pkg-config) --cflags libdrm)',
- ],
- },
- 'link_settings': {
- 'libraries': [
- '<!@(<(pkg-config) --libs-only-l libdrm)',
- ],
- },
- },
],
}
« 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