dev-python/numpy: record include_dirs of blas

We specify blas in site.cfg, which could have non-standard
  include dirs.  sci-libs/scikits_learn, for example,
  relies on this information to find cblas.

Upstream: https://github.com/numpy/numpy/pull/8619

Package-Manager: portage-2.3.3
This commit is contained in:
Benda Xu
2017-02-15 11:37:58 +09:00
parent dce4f3e5b3
commit 24fe73b1ff
2 changed files with 25 additions and 1 deletions

View File

@@ -0,0 +1,24 @@
commit 61e9159569a601315b67c30b6e26bbb2149c0bfa
Author: Benda Xu <heroxbd@gentoo.org>
Date: Wed Feb 15 11:17:05 2017 +0900
BUG: blas_info should record include_dirs
blas specified in site.cfg could have non-standard include dirs.
It should be read and saved in distutils/__config__.py
PR: https://github.com/numpy/numpy/pull/8619
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
index b8520ac..0fba865 100644
--- a/numpy/distutils/system_info.py
+++ b/numpy/distutils/system_info.py
@@ -1667,6 +1667,8 @@ class blas_info(system_info):
info = self.check_libs(lib_dirs, blas_libs, [])
if info is None:
return
+ else:
+ info['include_dirs'] = self.get_include_dirs()
if platform.system() == 'Windows':
# The check for windows is needed because has_cblas uses the
# same compiler that was used to compile Python and msvc is

View File

@@ -37,7 +37,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-1.11.1-no-hardcode-blas.patch
"${FILESDIR}"/${PN}-1.11.2-blas_rec_inc_dir.patch
# This has been fixed upstream but no new release yet
# https://github.com/numpy/numpy/commit/5d0ce36e5be134bb5ead03cab1edeaa60fa355aa
"${FILESDIR}"/${P}-import-module-fix.patch