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

Unified Diff: build/linux/system.gyp

Issue 692893004: Provide a way to disable libpci dependency. (Closed) Base URL: git://nuxepg2.fr.nds.com/CHROM/chromium-src.git@master
Patch Set: Move use_libpci = true into declare_args() Created 6 years, 1 month 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 | « build/common.gypi ('k') | gpu/config/BUILD.gn » ('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 8f9b2d8219ca52fcd17b1c0d42c71b7bdd0dece7..3e880939f8444ea57a743467361901a13ea99a48 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -466,6 +466,74 @@
},
],
}],
+ ['use_libpci==1', {
+ 'targets': [
+ {
+ '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,
+ },
+ ],
+ },
+ ],
+ }],
], # conditions
'targets': [
{
@@ -841,70 +909,6 @@
},
},
{
- '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': 'libresolv',
'type': 'none',
'link_settings': {
« no previous file with comments | « build/common.gypi ('k') | gpu/config/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698