| 1 |
commit: 4b404bb737eed5f2ddc6a7ae84e6b74af53b6fd4 |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Tue Nov 16 16:51:43 2021 +0000 |
| 4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 23 20:33:15 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b404bb7 |
| 7 |
|
| 8 |
dev-python/blosc: remove unused patch(es) |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/22973 |
| 11 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 12 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-python/blosc/files/blosc-1.10.0-unbundle.patch | 38 ---------------------- |
| 16 |
.../blosc/files/blosc-1.10.4-cpu-flags.patch | 22 ------------- |
| 17 |
2 files changed, 60 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-python/blosc/files/blosc-1.10.0-unbundle.patch b/dev-python/blosc/files/blosc-1.10.0-unbundle.patch |
| 20 |
deleted file mode 100644 |
| 21 |
index 0ea6740f9c07..000000000000 |
| 22 |
--- a/dev-python/blosc/files/blosc-1.10.0-unbundle.patch |
| 23 |
+++ /dev/null |
| 24 |
@@ -1,38 +0,0 @@ |
| 25 |
-From b2935461d889eac99fa1bdfb04a96f1c3a23c4c3 Mon Sep 17 00:00:00 2001 |
| 26 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 27 |
-Date: Thu, 24 Dec 2020 01:06:23 +0100 |
| 28 |
-Subject: [PATCH] build against system blosc |
| 29 |
- |
| 30 |
---- |
| 31 |
- blosc/CMakeLists.txt | 14 ++------------ |
| 32 |
- 1 file changed, 2 insertions(+), 12 deletions(-) |
| 33 |
- |
| 34 |
-diff --git a/blosc/CMakeLists.txt b/blosc/CMakeLists.txt |
| 35 |
-index 7f06f28..fcf7db0 100644 |
| 36 |
---- a/blosc/CMakeLists.txt |
| 37 |
-+++ b/blosc/CMakeLists.txt |
| 38 |
-@@ -1,19 +1,9 @@ |
| 39 |
- # Todo: c-blosc provides a CMake package configuration file that we can build |
| 40 |
- # against if blosc is available on the system, etc. |
| 41 |
--# find_package(blosc) |
| 42 |
--# if(NOT blosc_FOUND) |
| 43 |
--set(BUILD_STATIC ON CACHE BOOL "Build a static version of the blosc library.") |
| 44 |
--set(BUILD_SHARED ON CACHE BOOL "Build a shared library version of the blosc library.") |
| 45 |
--set(BUILD_TESTS OFF CACHE BOOL "Build test programs form the blosc compression library") |
| 46 |
--set(BUILD_BENCHMARKS OFF CACHE BOOL "Build benchmark programs form the blosc compression library") |
| 47 |
--set(BLOSC_IS_SUBPROJECT OFF CACHE BOOL "Blosc is subproject") |
| 48 |
--set(CMAKE_POSITION_INDEPENDENT_CODE ON) |
| 49 |
--add_subdirectory(c-blosc) |
| 50 |
--include_directories("${CMAKE_CURRENT_SOURCE_DIR}/c-blosc/blosc") |
| 51 |
-- |
| 52 |
-+find_package(blosc) |
| 53 |
- |
| 54 |
- add_library(blosc_extension MODULE blosc_extension.c) |
| 55 |
--target_link_libraries(blosc_extension blosc_static) |
| 56 |
-+target_link_libraries(blosc_extension blosc) |
| 57 |
- python_extension_module(blosc_extension) |
| 58 |
- |
| 59 |
- add_custom_command( |
| 60 |
--- |
| 61 |
-2.29.2 |
| 62 |
- |
| 63 |
|
| 64 |
diff --git a/dev-python/blosc/files/blosc-1.10.4-cpu-flags.patch b/dev-python/blosc/files/blosc-1.10.4-cpu-flags.patch |
| 65 |
deleted file mode 100644 |
| 66 |
index 1e2641646138..000000000000 |
| 67 |
--- a/dev-python/blosc/files/blosc-1.10.4-cpu-flags.patch |
| 68 |
+++ /dev/null |
| 69 |
@@ -1,22 +0,0 @@ |
| 70 |
-https://github.com/Blosc/python-blosc/commit/70226a70907072be607caee3da472e37a4683bae |
| 71 |
-https://github.com/Blosc/python-blosc/issues/227 |
| 72 |
-https://bugs.gentoo.org/732178 |
| 73 |
- |
| 74 |
-From: Graham Inggs <ginggs@××××××.org> |
| 75 |
-Date: Tue, 3 Aug 2021 17:11:51 +0200 |
| 76 |
-Subject: [PATCH] Deactivate SSE2 and AVX2 if a CPU has no flags (#242) |
| 77 |
- |
| 78 |
-Fixes #277 |
| 79 |
---- a/setup.py |
| 80 |
-+++ b/setup.py |
| 81 |
-@@ -90,8 +90,8 @@ def cmake_bool(cond): |
| 82 |
- platforms = ['any'], |
| 83 |
- cmake_args = [ |
| 84 |
- '-DBLOSC_DIR:PATH=%s' % os.environ.get('BLOSC_DIR', ''), |
| 85 |
-- '-DDEACTIVATE_SSE2:BOOL=%s' % cmake_bool(('DISABLE_BLOSC_SSE2' in os.environ) or (cpu_info is None) or ('sse2' not in cpu_info['flags'])), |
| 86 |
-- '-DDEACTIVATE_AVX2:BOOL=%s' % cmake_bool(('DISABLE_BLOSC_AVX2' in os.environ) or (cpu_info is None) or ('avx2' not in cpu_info['flags'])), |
| 87 |
-+ '-DDEACTIVATE_SSE2:BOOL=%s' % cmake_bool(('DISABLE_BLOSC_SSE2' in os.environ) or (cpu_info is None) or ('flags' not in cpu_info) or ('sse2' not in cpu_info['flags'])), |
| 88 |
-+ '-DDEACTIVATE_AVX2:BOOL=%s' % cmake_bool(('DISABLE_BLOSC_AVX2' in os.environ) or (cpu_info is None) or ('flags' not in cpu_info) or ('avx2' not in cpu_info['flags'])), |
| 89 |
- '-DDEACTIVATE_LZ4:BOOL=%s' % cmake_bool(not int(os.environ.get('INCLUDE_LZ4', '1'))), |
| 90 |
- # Snappy is disabled by default |
| 91 |
- '-DDEACTIVATE_SNAPPY:BOOL=%s' % cmake_bool(not int(os.environ.get('INCLUDE_SNAPPY', '0'))), |
Archives