commit: 96f70ec483484bdd881bfb4732ca9e7d12b0fd6e Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Jun 25 04:45:19 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Jun 25 04:46:15 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96f70ec4
dev-python/numpy: Add missing patch Closes: https://bugs.gentoo.org/798471 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> .../files/numpy-1.21.0-no-hardcode-blasv2.patch | 51 ++++++++++++++++++++++ profiles/package.mask | 5 --- 2 files changed, 51 insertions(+), 5 deletions(-) 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 new file mode 100644 index 00000000000..bc3fbda4bf2 --- /dev/null +++ b/dev-python/numpy/files/numpy-1.21.0-no-hardcode-blasv2.patch @@ -0,0 +1,51 @@ +diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py +index 82e864a5c..1d77e5854 100644 +--- a/numpy/distutils/system_info.py ++++ b/numpy/distutils/system_info.py +@@ -501,33 +501,7 @@ def get_info(name, notfound_action=0): + 1 - display warning message + 2 - raise error + """ +- cl = {'atlas': atlas_info, # use lapack_opt or blas_opt instead +- 'atlas_threads': atlas_threads_info, # ditto +- 'atlas_blas': atlas_blas_info, +- 'atlas_blas_threads': atlas_blas_threads_info, +- 'lapack_atlas': lapack_atlas_info, # use lapack_opt instead +- 'lapack_atlas_threads': lapack_atlas_threads_info, # ditto +- 'atlas_3_10': atlas_3_10_info, # use lapack_opt or blas_opt instead +- 'atlas_3_10_threads': atlas_3_10_threads_info, # ditto +- 'atlas_3_10_blas': atlas_3_10_blas_info, +- 'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info, +- 'lapack_atlas_3_10': lapack_atlas_3_10_info, # use lapack_opt instead +- 'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info, # ditto +- 'flame': flame_info, # use lapack_opt instead +- 'mkl': mkl_info, +- # openblas which may or may not have embedded lapack +- 'openblas': openblas_info, # use blas_opt instead +- # openblas with embedded lapack +- 'openblas_lapack': openblas_lapack_info, # use blas_opt instead +- 'openblas_clapack': openblas_clapack_info, # use blas_opt instead +- 'blis': blis_info, # use blas_opt instead +- 'lapack_mkl': lapack_mkl_info, # use lapack_opt instead +- 'blas_mkl': blas_mkl_info, # use blas_opt instead +- 'accelerate': accelerate_info, # use blas_opt instead +- 'openblas64_': openblas64__info, +- 'openblas64__lapack': openblas64__lapack_info, +- 'openblas_ilp64': openblas_ilp64_info, +- 'openblas_ilp64_lapack': openblas_ilp64_lapack_info, ++ cl = {'flame': flame_info, # use lapack_opt instead + 'x11': x11_info, + 'fft_opt': fft_opt_info, + 'fftw': fftw_info, +@@ -947,10 +921,7 @@ def get_libs(self, key, default): + return [b for b in [a.strip() for a in libs.split(',')] if b] + + def get_libraries(self, key='libraries'): +- if hasattr(self, '_lib_names'): +- return self.get_libs(key, default=self._lib_names) +- else: +- return self.get_libs(key, '') ++ return self.get_libs(key, '') + + def library_extensions(self): + c = customized_ccompiler() diff --git a/profiles/package.mask b/profiles/package.mask index 2ee622348cb..0bec4a6b853 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -32,11 +32,6 @@ #--- END OF EXAMPLES --- -# Sam James <[email protected]> (2021-06-25) -# Missing patch file for now. -# bug #798471 -=dev-python/numpy-1.21.0 - # Volkmar W. Pogatzki <[email protected]> (2021-06-21) # library with no consumer, removal in 30 days # see https://bugs.gentoo.org/794562
