mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-28 09:37:29 -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
55 lines
2.0 KiB
Diff
55 lines
2.0 KiB
Diff
https://github.com/matplotlib/matplotlib/pull/4430
|
|
|
|
From 3761303016cab0542891374032eca87e74d585bf Mon Sep 17 00:00:00 2001
|
|
From: Mike Frysinger <vapier@chromium.org>
|
|
Date: Fri, 15 May 2015 03:43:17 -0400
|
|
Subject: [PATCH 2/3] setupext: do not mess with PKG_CONFIG_PATH
|
|
|
|
The current code always sets PKG_CONFIG_PATH to build paths in / which
|
|
breaks cross-compiling -- things like /usr/lib are for the build system
|
|
(e.g. x86) and not for the target (e.g. arm). Since we're adding paths
|
|
that are already the default for pkg-config, there's no point in trying
|
|
to be smart here. Just punt the code.
|
|
|
|
This basically reverts commit 101beb975d3a1218350f02bf68dc2a43ac8ff148.
|
|
---
|
|
setupext.py | 15 ---------------
|
|
1 file changed, 15 deletions(-)
|
|
|
|
diff --git a/setupext.py b/setupext.py
|
|
index 29cddf9..57d80e7 100755
|
|
--- a/setupext.py
|
|
+++ b/setupext.py
|
|
@@ -252,7 +252,6 @@ class PkgConfig(object):
|
|
if sys.platform == 'win32':
|
|
self.has_pkgconfig = False
|
|
else:
|
|
- self.set_pkgconfig_path()
|
|
self.pkgconfig = os.environ.get('PKG_CONFIG', 'pkg-config')
|
|
status, output = getstatusoutput("%s --help" % self.pkgconfig)
|
|
self.has_pkgconfig = (status == 0)
|
|
@@ -262,20 +261,6 @@ class PkgConfig(object):
|
|
" pkg-config is not installed.\n"
|
|
" matplotlib may not be able to find some of its dependencies")
|
|
|
|
- def set_pkgconfig_path(self):
|
|
- pkgconfig_path = sysconfig.get_config_var('LIBDIR')
|
|
- if pkgconfig_path is None:
|
|
- return
|
|
-
|
|
- pkgconfig_path = os.path.join(pkgconfig_path, 'pkgconfig')
|
|
- if not os.path.isdir(pkgconfig_path):
|
|
- return
|
|
-
|
|
- try:
|
|
- os.environ['PKG_CONFIG_PATH'] += ':' + pkgconfig_path
|
|
- except KeyError:
|
|
- os.environ['PKG_CONFIG_PATH'] = pkgconfig_path
|
|
-
|
|
def setup_extension(self, ext, package, default_include_dirs=[],
|
|
default_library_dirs=[], default_libraries=[],
|
|
alt_exec=None):
|
|
--
|
|
2.4.0
|
|
|