[xboxdrv] 25/78: Use the appropriate pkg-config via the exported variable

Andrey Rahmatullin wrar-guest at moszumanska.debian.org
Sun Feb 21 17:55:08 UTC 2016


This is an automated email from the git hooks/post-receive script.

wrar-guest pushed a commit to branch master
in repository xboxdrv.

commit 98183e6c290236f8f446a51db7b9fd2a1592ad39
Author: Timo Gurr <tgurr at exherbo.org>
Date:   Tue May 5 01:13:19 2015 +0200

    Use the appropriate pkg-config via the exported variable
---
 SConstruct | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/SConstruct b/SConstruct
index 05407c9..1aed437 100644
--- a/SConstruct
+++ b/SConstruct
@@ -86,6 +86,7 @@ opts.Add('LINKFLAGS', 'Linker Compiler flags')
 opts.Add('CC', 'C Compiler')
 opts.Add('CXX', 'C++ Compiler')
 opts.Add('BUILD', 'Build type: release, custom, development')
+opts.Add('PKG_CONFIG', 'pkg-config helper tool', 'pkg-config')
 
 opts.Update(env)
 Help(opts.GenerateHelpText(env))
@@ -114,11 +115,11 @@ elif 'BUILD' in env and env['BUILD'] == 'custom':
 else:
     env.Append(CPPFLAGS = ['-g', '-O3', '-Wall', '-ansi', '-pedantic'])
 
-env.ParseConfig("pkg-config --cflags --libs dbus-glib-1 | sed 's/-I/-isystem/g'")
-env.ParseConfig("pkg-config --cflags --libs glib-2.0 | sed 's/-I/-isystem/g'")
-env.ParseConfig("pkg-config --cflags --libs gthread-2.0 | sed 's/-I/-isystem/g'")
-env.ParseConfig("pkg-config --cflags --libs libusb-1.0 | sed 's/-I/-isystem/g'")
-env.ParseConfig("pkg-config --cflags --libs libudev | sed 's/-I/-isystem/g'")
+env.ParseConfig(env['PKG_CONFIG'] + " --cflags --libs dbus-glib-1 | sed 's/-I/-isystem/g'")
+env.ParseConfig(env['PKG_CONFIG'] + " --cflags --libs glib-2.0 | sed 's/-I/-isystem/g'")
+env.ParseConfig(env['PKG_CONFIG'] + " --cflags --libs gthread-2.0 | sed 's/-I/-isystem/g'")
+env.ParseConfig(env['PKG_CONFIG'] + " --cflags --libs libusb-1.0 | sed 's/-I/-isystem/g'")
+env.ParseConfig(env['PKG_CONFIG'] + " --cflags --libs libudev | sed 's/-I/-isystem/g'")
 
 f = open("VERSION")
 package_version = f.read()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/xboxdrv.git



More information about the Pkg-games-commits mailing list