| 1 |
commit: 24fe73b1ff793e8a9170b0c2f71335d8bd20a258 |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 15 02:37:58 2017 +0000 |
| 4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 15 02:38:14 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24fe73b1 |
| 7 |
|
| 8 |
dev-python/numpy: record include_dirs of blas |
| 9 |
|
| 10 |
We specify blas in site.cfg, which could have non-standard |
| 11 |
include dirs. sci-libs/scikits_learn, for example, |
| 12 |
relies on this information to find cblas. |
| 13 |
|
| 14 |
Upstream: https://github.com/numpy/numpy/pull/8619 |
| 15 |
|
| 16 |
Package-Manager: portage-2.3.3 |
| 17 |
|
| 18 |
.../files/numpy-1.11.2-blas_rec_inc_dir.patch | 24 ++++++++++++++++++++++ |
| 19 |
dev-python/numpy/numpy-1.11.2-r1.ebuild | 2 +- |
| 20 |
2 files changed, 25 insertions(+), 1 deletion(-) |
| 21 |
|
| 22 |
diff --git a/dev-python/numpy/files/numpy-1.11.2-blas_rec_inc_dir.patch b/dev-python/numpy/files/numpy-1.11.2-blas_rec_inc_dir.patch |
| 23 |
new file mode 100644 |
| 24 |
index 0000000000..9a934cc2a4 |
| 25 |
--- /dev/null |
| 26 |
+++ b/dev-python/numpy/files/numpy-1.11.2-blas_rec_inc_dir.patch |
| 27 |
@@ -0,0 +1,24 @@ |
| 28 |
+commit 61e9159569a601315b67c30b6e26bbb2149c0bfa |
| 29 |
+Author: Benda Xu <heroxbd@g.o> |
| 30 |
+Date: Wed Feb 15 11:17:05 2017 +0900 |
| 31 |
+ |
| 32 |
+ BUG: blas_info should record include_dirs |
| 33 |
+ |
| 34 |
+ blas specified in site.cfg could have non-standard include dirs. |
| 35 |
+ It should be read and saved in distutils/__config__.py |
| 36 |
+ |
| 37 |
+PR: https://github.com/numpy/numpy/pull/8619 |
| 38 |
+ |
| 39 |
+diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py |
| 40 |
+index b8520ac..0fba865 100644 |
| 41 |
+--- a/numpy/distutils/system_info.py |
| 42 |
++++ b/numpy/distutils/system_info.py |
| 43 |
+@@ -1667,6 +1667,8 @@ class blas_info(system_info): |
| 44 |
+ info = self.check_libs(lib_dirs, blas_libs, []) |
| 45 |
+ if info is None: |
| 46 |
+ return |
| 47 |
++ else: |
| 48 |
++ info['include_dirs'] = self.get_include_dirs() |
| 49 |
+ if platform.system() == 'Windows': |
| 50 |
+ # The check for windows is needed because has_cblas uses the |
| 51 |
+ # same compiler that was used to compile Python and msvc is |
| 52 |
|
| 53 |
diff --git a/dev-python/numpy/numpy-1.11.2-r1.ebuild b/dev-python/numpy/numpy-1.11.2-r1.ebuild |
| 54 |
index 87da9bf152..803872d816 100644 |
| 55 |
--- a/dev-python/numpy/numpy-1.11.2-r1.ebuild |
| 56 |
+++ b/dev-python/numpy/numpy-1.11.2-r1.ebuild |
| 57 |
@@ -37,7 +37,7 @@ DEPEND="${RDEPEND} |
| 58 |
|
| 59 |
PATCHES=( |
| 60 |
"${FILESDIR}"/${PN}-1.11.1-no-hardcode-blas.patch |
| 61 |
- |
| 62 |
+ "${FILESDIR}"/${PN}-1.11.2-blas_rec_inc_dir.patch |
| 63 |
# This has been fixed upstream but no new release yet |
| 64 |
# https://github.com/numpy/numpy/commit/5d0ce36e5be134bb5ead03cab1edeaa60fa355aa |
| 65 |
"${FILESDIR}"/${P}-import-module-fix.patch |
Archives