mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-27 21:27:27 -08:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
51 lines
1.7 KiB
Diff
51 lines
1.7 KiB
Diff
https://github.com/matplotlib/matplotlib/pull/4430
|
|
|
|
From 08d26a80859023963bc2ffb41a0b6aed942685a9 Mon Sep 17 00:00:00 2001
|
|
From: Mike Frysinger <vapier@chromium.org>
|
|
Date: Fri, 15 May 2015 03:36:45 -0400
|
|
Subject: [PATCH 1/3] setupext: respect $PKG_CONFIG
|
|
|
|
When cross-compiling, it is common to set the PKG_CONFIG env var to a
|
|
custom pkg-config that knows about the target. Make sure we respect
|
|
that just like the standard pkg-config tools suggest (pkg.m4). If it
|
|
isn't set, we use the same default as today -- "pkg-config".
|
|
---
|
|
setupext.py | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/setupext.py b/setupext.py
|
|
index 80b2a6c..29cddf9 100755
|
|
--- a/setupext.py
|
|
+++ b/setupext.py
|
|
@@ -253,7 +253,8 @@ class PkgConfig(object):
|
|
self.has_pkgconfig = False
|
|
else:
|
|
self.set_pkgconfig_path()
|
|
- status, output = getstatusoutput("pkg-config --help")
|
|
+ self.pkgconfig = os.environ.get('PKG_CONFIG', 'pkg-config')
|
|
+ status, output = getstatusoutput("%s --help" % self.pkgconfig)
|
|
self.has_pkgconfig = (status == 0)
|
|
if not self.has_pkgconfig:
|
|
print("IMPORTANT WARNING:")
|
|
@@ -286,7 +287,7 @@ class PkgConfig(object):
|
|
|
|
executable = alt_exec
|
|
if self.has_pkgconfig:
|
|
- executable = 'pkg-config {0}'.format(package)
|
|
+ executable = '%s %s' % (self.pkgconfig, package)
|
|
|
|
use_defaults = True
|
|
|
|
@@ -330,7 +331,7 @@ class PkgConfig(object):
|
|
return None
|
|
|
|
status, output = getstatusoutput(
|
|
- "pkg-config %s --modversion" % (package))
|
|
+ '%s %s --modversion' % (self.pkgconfig, package))
|
|
if status == 0:
|
|
return output
|
|
return None
|
|
--
|
|
2.4.0
|
|
|