| 1 |
commit: 96f70ec483484bdd881bfb4732ca9e7d12b0fd6e |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jun 25 04:45:19 2021 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 25 04:46:15 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96f70ec4 |
| 7 |
|
| 8 |
dev-python/numpy: Add missing patch |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/798471 |
| 11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/numpy-1.21.0-no-hardcode-blasv2.patch | 51 ++++++++++++++++++++++ |
| 14 |
profiles/package.mask | 5 --- |
| 15 |
2 files changed, 51 insertions(+), 5 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-python/numpy/files/numpy-1.21.0-no-hardcode-blasv2.patch b/dev-python/numpy/files/numpy-1.21.0-no-hardcode-blasv2.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..bc3fbda4bf2 |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-python/numpy/files/numpy-1.21.0-no-hardcode-blasv2.patch |
| 22 |
@@ -0,0 +1,51 @@ |
| 23 |
+diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py |
| 24 |
+index 82e864a5c..1d77e5854 100644 |
| 25 |
+--- a/numpy/distutils/system_info.py |
| 26 |
++++ b/numpy/distutils/system_info.py |
| 27 |
+@@ -501,33 +501,7 @@ def get_info(name, notfound_action=0): |
| 28 |
+ 1 - display warning message |
| 29 |
+ 2 - raise error |
| 30 |
+ """ |
| 31 |
+- cl = {'atlas': atlas_info, # use lapack_opt or blas_opt instead |
| 32 |
+- 'atlas_threads': atlas_threads_info, # ditto |
| 33 |
+- 'atlas_blas': atlas_blas_info, |
| 34 |
+- 'atlas_blas_threads': atlas_blas_threads_info, |
| 35 |
+- 'lapack_atlas': lapack_atlas_info, # use lapack_opt instead |
| 36 |
+- 'lapack_atlas_threads': lapack_atlas_threads_info, # ditto |
| 37 |
+- 'atlas_3_10': atlas_3_10_info, # use lapack_opt or blas_opt instead |
| 38 |
+- 'atlas_3_10_threads': atlas_3_10_threads_info, # ditto |
| 39 |
+- 'atlas_3_10_blas': atlas_3_10_blas_info, |
| 40 |
+- 'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info, |
| 41 |
+- 'lapack_atlas_3_10': lapack_atlas_3_10_info, # use lapack_opt instead |
| 42 |
+- 'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info, # ditto |
| 43 |
+- 'flame': flame_info, # use lapack_opt instead |
| 44 |
+- 'mkl': mkl_info, |
| 45 |
+- # openblas which may or may not have embedded lapack |
| 46 |
+- 'openblas': openblas_info, # use blas_opt instead |
| 47 |
+- # openblas with embedded lapack |
| 48 |
+- 'openblas_lapack': openblas_lapack_info, # use blas_opt instead |
| 49 |
+- 'openblas_clapack': openblas_clapack_info, # use blas_opt instead |
| 50 |
+- 'blis': blis_info, # use blas_opt instead |
| 51 |
+- 'lapack_mkl': lapack_mkl_info, # use lapack_opt instead |
| 52 |
+- 'blas_mkl': blas_mkl_info, # use blas_opt instead |
| 53 |
+- 'accelerate': accelerate_info, # use blas_opt instead |
| 54 |
+- 'openblas64_': openblas64__info, |
| 55 |
+- 'openblas64__lapack': openblas64__lapack_info, |
| 56 |
+- 'openblas_ilp64': openblas_ilp64_info, |
| 57 |
+- 'openblas_ilp64_lapack': openblas_ilp64_lapack_info, |
| 58 |
++ cl = {'flame': flame_info, # use lapack_opt instead |
| 59 |
+ 'x11': x11_info, |
| 60 |
+ 'fft_opt': fft_opt_info, |
| 61 |
+ 'fftw': fftw_info, |
| 62 |
+@@ -947,10 +921,7 @@ def get_libs(self, key, default): |
| 63 |
+ return [b for b in [a.strip() for a in libs.split(',')] if b] |
| 64 |
+ |
| 65 |
+ def get_libraries(self, key='libraries'): |
| 66 |
+- if hasattr(self, '_lib_names'): |
| 67 |
+- return self.get_libs(key, default=self._lib_names) |
| 68 |
+- else: |
| 69 |
+- return self.get_libs(key, '') |
| 70 |
++ return self.get_libs(key, '') |
| 71 |
+ |
| 72 |
+ def library_extensions(self): |
| 73 |
+ c = customized_ccompiler() |
| 74 |
|
| 75 |
diff --git a/profiles/package.mask b/profiles/package.mask |
| 76 |
index 2ee622348cb..0bec4a6b853 100644 |
| 77 |
--- a/profiles/package.mask |
| 78 |
+++ b/profiles/package.mask |
| 79 |
@@ -32,11 +32,6 @@ |
| 80 |
|
| 81 |
#--- END OF EXAMPLES --- |
| 82 |
|
| 83 |
-# Sam James <sam@g.o> (2021-06-25) |
| 84 |
-# Missing patch file for now. |
| 85 |
-# bug #798471 |
| 86 |
-=dev-python/numpy-1.21.0 |
| 87 |
- |
| 88 |
# Volkmar W. Pogatzki <gentoo@××××××××.net> (2021-06-21) |
| 89 |
# library with no consumer, removal in 30 days |
| 90 |
# see https://bugs.gentoo.org/794562 |
Archives