diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/linux/pkg_config_wrapper.py | 30 | ||||
| -rw-r--r-- | build/linux/system.gyp | 48 |
2 files changed, 24 insertions, 54 deletions
diff --git a/build/linux/pkg_config_wrapper.py b/build/linux/pkg_config_wrapper.py deleted file mode 100644 index 3060340..0000000 --- a/build/linux/pkg_config_wrapper.py +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/env python -# Copyright (c) 2009 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -__doc__ = """ -Wrapper script for executing pkg-config with the arguments supplied -on the command line and suppressing the exit status and error output -when the error is simply that the specified package isn't installed. -""" - -import sys -import subprocess - -p = subprocess.Popen(['pkg-config'] + sys.argv[1:], - stderr=subprocess.PIPE) -(stdout, stderr) = p.communicate() - -exit_status = p.wait() - -if exit_status == 1: - import re - if re.search('No package.*found', stderr): - # Exit status of 1 with a presumably "normal" not found message. - # Just swallow the "error." - sys.exit(0) - -sys.stderr.write(stderr) - -sys.exit(exit_status) diff --git a/build/linux/system.gyp b/build/linux/system.gyp index 8800cb6..a3e8cbc 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)', ], }, }, |