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

Unified Diff: build/linux/system.gyp

Issue 114007: linux: gyp should fail if the build dependencies aren't met. (Closed)
Patch Set: Created 11 years, 7 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 | « build/linux/pkg_config_wrapper.py ('k') | 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 8800cb62fde47b2fe8e884beaf5adcacab94675b..a3e8cbc9c9e8c4d77bbfeb28383bd43708ae45d7 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -9,15 +9,15 @@
'type': 'settings',
'direct_dependent_settings': {
'cflags': [
- '<!@(python pkg_config_wrapper.py --cflags gtk+-2.0)',
+ '<!@(pkg-config --cflags gtk+-2.0)',
],
},
'link_settings': {
'ldflags': [
- '<!@(python pkg_config_wrapper.py --libs-only-L --libs-only-other gtk+-2.0)',
+ '<!@(pkg-config --libs-only-L --libs-only-other gtk+-2.0)',
],
'libraries': [
- '<!@(python pkg_config_wrapper.py --libs-only-l gtk+-2.0)',
+ '<!@(pkg-config --libs-only-l gtk+-2.0)',
],
},
},
@@ -26,15 +26,15 @@
'type': 'settings',
'direct_dependent_settings': {
'cflags': [
- '<!@(python pkg_config_wrapper.py --cflags nss)',
+ '<!@(pkg-config --cflags nss)',
],
},
'link_settings': {
'ldflags': [
- '<!@(python pkg_config_wrapper.py --libs-only-L --libs-only-other nss)',
+ '<!@(pkg-config --libs-only-L --libs-only-other nss)',
],
'libraries': [
- '<!@(python pkg_config_wrapper.py --libs-only-l nss)',
+ '<!@(pkg-config --libs-only-l nss)',
],
},
},
@@ -43,15 +43,15 @@
'type': 'settings',
'direct_dependent_settings': {
'cflags': [
- '<!@(python pkg_config_wrapper.py --cflags freetype2)',
+ '<!@(pkg-config --cflags freetype2)',
],
},
'link_settings': {
'ldflags': [
- '<!@(python pkg_config_wrapper.py --libs-only-L --libs-only-other freetype2)',
+ '<!@(pkg-config --libs-only-L --libs-only-other freetype2)',
],
'libraries': [
- '<!@(python pkg_config_wrapper.py --libs-only-l freetype2)',
+ '<!@(pkg-config --libs-only-l freetype2)',
],
},
},
@@ -60,15 +60,15 @@
'type': 'settings',
'direct_dependent_settings': {
'cflags': [
- '<!@(python pkg_config_wrapper.py --cflags fontconfig)',
+ '<!@(pkg-config --cflags fontconfig)',
],
},
'link_settings': {
'ldflags': [
- '<!@(python pkg_config_wrapper.py --libs-only-L --libs-only-other fontconfig)',
+ '<!@(pkg-config --libs-only-L --libs-only-other fontconfig)',
],
'libraries': [
- '<!@(python pkg_config_wrapper.py --libs-only-l fontconfig)',
+ '<!@(pkg-config --libs-only-l fontconfig)',
],
},
},
@@ -77,15 +77,15 @@
'type': 'settings',
'direct_dependent_settings': {
'cflags': [
- '<!@(python pkg_config_wrapper.py --cflags gdk-2.0)',
+ '<!@(pkg-config --cflags gdk-2.0)',
],
},
'link_settings': {
'ldflags': [
- '<!@(python pkg_config_wrapper.py --libs-only-L --libs-only-other gdk-2.0)',
+ '<!@(pkg-config --libs-only-L --libs-only-other gdk-2.0)',
],
'libraries': [
- '<!@(python pkg_config_wrapper.py --libs-only-l gdk-2.0)',
+ '<!@(pkg-config --libs-only-l gdk-2.0)',
],
},
},
@@ -94,15 +94,15 @@
'type': 'settings',
'direct_dependent_settings': {
'cflags': [
- '<!@(python pkg_config_wrapper.py --cflags gconf-2.0)',
+ '<!@(pkg-config --cflags gconf-2.0)',
],
},
'link_settings': {
'ldflags': [
- '<!@(python pkg_config_wrapper.py --libs-only-L --libs-only-other gconf-2.0)',
+ '<!@(pkg-config --libs-only-L --libs-only-other gconf-2.0)',
],
'libraries': [
- '<!@(python pkg_config_wrapper.py --libs-only-l gconf-2.0)',
+ '<!@(pkg-config --libs-only-l gconf-2.0)',
],
},
},
@@ -111,15 +111,15 @@
'type': 'settings',
'direct_dependent_settings': {
'cflags': [
- '<!@(python pkg_config_wrapper.py --cflags gthread-2.0)',
+ '<!@(pkg-config --cflags gthread-2.0)',
],
},
'link_settings': {
'ldflags': [
- '<!@(python pkg_config_wrapper.py --libs-only-L --libs-only-other gthread-2.0)',
+ '<!@(pkg-config --libs-only-L --libs-only-other gthread-2.0)',
],
'libraries': [
- '<!@(python pkg_config_wrapper.py --libs-only-l gthread-2.0)',
+ '<!@(pkg-config --libs-only-l gthread-2.0)',
],
},
},
@@ -128,15 +128,15 @@
'type': 'settings',
'direct_dependent_settings': {
'cflags': [
- '<!@(python pkg_config_wrapper.py --cflags x11)',
+ '<!@(pkg-config --cflags x11)',
],
},
'link_settings': {
'ldflags': [
- '<!@(python pkg_config_wrapper.py --libs-only-L --libs-only-other x11)',
+ '<!@(pkg-config --libs-only-L --libs-only-other x11)',
],
'libraries': [
- '<!@(python pkg_config_wrapper.py --libs-only-l x11)',
+ '<!@(pkg-config --libs-only-l x11)',
],
},
},
« no previous file with comments | « build/linux/pkg_config_wrapper.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698