[gentoo-commits] gentoo-x86 commit in dev-python/matplotlib/files: matplotlib-1.4.3-cross-compile-2.patch matplotlib-1.4.3-cross-compile-3.patch matplotlib-1.4.3-cross-compile-1.patch

[gentoo-commits] gentoo-x86 commit in dev-python/matplotlib/files: matplotlib-1.4.3-cross-compile-2.patch matplotlib-1.4.3-cross-compile-3.patch matplotlib-1.4.3-cross-compile-1.patch

[Mike Frysinger (vapier)]

vapier      15/05/15 08:36:20

  Added:                matplotlib-1.4.3-cross-compile-2.patch
                        matplotlib-1.4.3-cross-compile-3.patch
                        matplotlib-1.4.3-cross-compile-1.patch
  Log:
  Fix cross-compiling logic and how we handle pkg-config.
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

Revision  Changes    Path
1.1                  dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-2.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-2.patch?rev=1.1&content-type=text/plain

Index: matplotlib-1.4.3-cross-compile-2.patch
===================================================================
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




1.1                  dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-3.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-3.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-3.patch?rev=1.1&content-type=text/plain

Index: matplotlib-1.4.3-cross-compile-3.patch
===================================================================
https://github.com/matplotlib/matplotlib/pull/4430

From d077e49be318c851f6bbd64708efeed78a3ece3f Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@chromium.org>
Date: Fri, 15 May 2015 03:49:02 -0400
Subject: [PATCH 3/3] setupext: do not hardcode system -I/-L paths

The native compiler should already know the right paths to look for
includes and libraries.  Hardcoding a specific list of those paths
breaks both cross-compiling and multilib.  In the former, paths like
/usr/include and /usr/lib are for x86 but when you want to build for
arm, mixing them leads to bad failures.  In the latter, paths like
/usr/lib typically hold 32it libraries, but when you're building for
64bit, you want the libs from /usr/lib64.  This goes even further as
there are other mixed ABIs like /usr/libx32 and /usr/lib32, neither
of which are handled here.

Instead, delete the code entirely and rely on the compiler being
properly configured.  If you want to use a misconfigured compiler,
you can always set CFLAGS/CPPFLAGS/LDFLAGS to include the -I/-L
that your system needs.
---
 setupext.py | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/setupext.py b/setupext.py
index 57d80e7..7473e3a 100755
--- a/setupext.py
+++ b/setupext.py
@@ -216,9 +216,7 @@ sysconfig.customize_compiler = my_customize_compiler
 
 def make_extension(name, files, *args, **kwargs):
     """
-    Make a new extension.  Automatically sets include_dirs and
-    library_dirs to the base directories appropriate for this
-    platform.
+    Make a new extension.
 
     `name` is the name of the extension.
 
@@ -228,14 +226,6 @@ def make_extension(name, files, *args, **kwargs):
     `distutils.core.Extension` constructor.
     """
     ext = DelayedExtension(name, files, *args, **kwargs)
-    for dir in get_base_dirs():
-        include_dir = os.path.join(dir, 'include')
-        if os.path.exists(include_dir):
-            ext.include_dirs.append(include_dir)
-        for lib in ('lib', 'lib64'):
-            lib_dir = os.path.join(dir, lib)
-            if os.path.exists(lib_dir):
-                ext.library_dirs.append(lib_dir)
     ext.include_dirs.append('.')
 
     return ext
-- 
2.4.0




1.1                  dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-1.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-1.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-1.patch?rev=1.1&content-type=text/plain

Index: matplotlib-1.4.3-cross-compile-1.patch
===================================================================
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