| 1 |
vapier 11/11/21 22:09:57 |
| 2 |
|
| 3 |
Added: gpsd-3.3-pkg-config.patch |
| 4 |
Log: |
| 5 |
Respect PKG_CONFIG env var when building. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha75/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-geosciences/gpsd/files/gpsd-3.3-pkg-config.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.3-pkg-config.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.3-pkg-config.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: gpsd-3.3-pkg-config.patch |
| 16 |
=================================================================== |
| 17 |
From b6ef265b49d973acc2295f46f0518e0644ba7dbb Mon Sep 17 00:00:00 2001 |
| 18 |
From: Mike Frysinger <vapier@g.o> |
| 19 |
Date: Mon, 21 Nov 2011 16:05:27 -0500 |
| 20 |
Subject: [PATCH] respect PKG_CONFIG in the build env |
| 21 |
|
| 22 |
Signed-off-by: Mike Frysinger <vapier@g.o> |
| 23 |
--- |
| 24 |
SConstruct | 9 +++++---- |
| 25 |
1 files changed, 5 insertions(+), 4 deletions(-) |
| 26 |
|
| 27 |
diff --git a/SConstruct b/SConstruct |
| 28 |
index cb578fe..5bb0fed 100644 |
| 29 |
--- a/SConstruct |
| 30 |
+++ b/SConstruct |
| 31 |
@@ -214,8 +214,9 @@ env['PYTHON'] = sys.executable |
| 32 |
# explicitly quote them or (better yet) use the "=" form of GNU option |
| 33 |
# settings. |
| 34 |
env['STRIP'] = "strip" |
| 35 |
+env['PKG_CONFIG'] = "pkg-config" |
| 36 |
env['CHRPATH'] = 'chrpath' |
| 37 |
-for i in ["AR", "ARFLAGS", "CCFLAGS", "CFLAGS", "CC", "CXX", "CXXFLAGS", "STRIP", "CHRPATH", "LD", "TAR"]: |
| 38 |
+for i in ["AR", "ARFLAGS", "CCFLAGS", "CFLAGS", "CC", "CXX", "CXXFLAGS", "STRIP", "PKG_CONFIG", "CHRPATH", "LD", "TAR"]: |
| 39 |
if os.environ.has_key(i): |
| 40 |
j = i |
| 41 |
if i == "LD": |
| 42 |
@@ -407,9 +408,9 @@ cxx = config.CheckCXX() |
| 43 |
# define a helper function for pkg-config - we need to pass |
| 44 |
# --static for static linking, too. |
| 45 |
if env["shared"]: |
| 46 |
- pkg_config = lambda pkg: ['!pkg-config --cflags --libs %s' %(pkg, )] |
| 47 |
+ pkg_config = lambda pkg: ['!%s --cflags --libs %s' %(env['PKG_CONFIG'], pkg, )] |
| 48 |
else: |
| 49 |
- pkg_config = lambda pkg: ['!pkg-config --cflags --libs --static %s' %(pkg, )] |
| 50 |
+ pkg_config = lambda pkg: ['!%s --cflags --libs --static %s' %(env['PKG_CONFIG'], pkg, )] |
| 51 |
|
| 52 |
# GCC isn't always named gcc, alas. |
| 53 |
if env['CC'] == 'gcc' or (sys.platform.startswith('freebsd') and env['CC'] == 'cc'): |
| 54 |
@@ -339,7 +340,7 @@ if "help" in ARGLIST: |
| 55 |
|
| 56 |
def CheckPKG(context, name): |
| 57 |
context.Message( 'Checking for %s... ' % name ) |
| 58 |
- ret = context.TryAction('pkg-config --exists \'%s\'' % name)[0] |
| 59 |
+ ret = context.TryAction('%s --exists \'%s\'' % (env['PKG_CONFIG'], name))[0] |
| 60 |
context.Result( ret ) |
| 61 |
return ret |
| 62 |
|
| 63 |
-- |
| 64 |
1.7.6.1 |
Archives