commit: 4b404bb737eed5f2ddc6a7ae84e6b74af53b6fd4 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Tue Nov 16 16:51:43 2021 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Tue Nov 23 20:33:15 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b404bb7
dev-python/blosc: remove unused patch(es) Closes: https://github.com/gentoo/gentoo/pull/22973 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> dev-python/blosc/files/blosc-1.10.0-unbundle.patch | 38 ---------------------- .../blosc/files/blosc-1.10.4-cpu-flags.patch | 22 ------------- 2 files changed, 60 deletions(-) diff --git a/dev-python/blosc/files/blosc-1.10.0-unbundle.patch b/dev-python/blosc/files/blosc-1.10.0-unbundle.patch deleted file mode 100644 index 0ea6740f9c07..000000000000 --- a/dev-python/blosc/files/blosc-1.10.0-unbundle.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b2935461d889eac99fa1bdfb04a96f1c3a23c4c3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgo...@gentoo.org> -Date: Thu, 24 Dec 2020 01:06:23 +0100 -Subject: [PATCH] build against system blosc - ---- - blosc/CMakeLists.txt | 14 ++------------ - 1 file changed, 2 insertions(+), 12 deletions(-) - -diff --git a/blosc/CMakeLists.txt b/blosc/CMakeLists.txt -index 7f06f28..fcf7db0 100644 ---- a/blosc/CMakeLists.txt -+++ b/blosc/CMakeLists.txt -@@ -1,19 +1,9 @@ - # Todo: c-blosc provides a CMake package configuration file that we can build - # against if blosc is available on the system, etc. --# find_package(blosc) --# if(NOT blosc_FOUND) --set(BUILD_STATIC ON CACHE BOOL "Build a static version of the blosc library.") --set(BUILD_SHARED ON CACHE BOOL "Build a shared library version of the blosc library.") --set(BUILD_TESTS OFF CACHE BOOL "Build test programs form the blosc compression library") --set(BUILD_BENCHMARKS OFF CACHE BOOL "Build benchmark programs form the blosc compression library") --set(BLOSC_IS_SUBPROJECT OFF CACHE BOOL "Blosc is subproject") --set(CMAKE_POSITION_INDEPENDENT_CODE ON) --add_subdirectory(c-blosc) --include_directories("${CMAKE_CURRENT_SOURCE_DIR}/c-blosc/blosc") -- -+find_package(blosc) - - add_library(blosc_extension MODULE blosc_extension.c) --target_link_libraries(blosc_extension blosc_static) -+target_link_libraries(blosc_extension blosc) - python_extension_module(blosc_extension) - - add_custom_command( --- -2.29.2 - 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 deleted file mode 100644 index 1e2641646138..000000000000 --- a/dev-python/blosc/files/blosc-1.10.4-cpu-flags.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://github.com/Blosc/python-blosc/commit/70226a70907072be607caee3da472e37a4683bae -https://github.com/Blosc/python-blosc/issues/227 -https://bugs.gentoo.org/732178 - -From: Graham Inggs <gin...@debian.org> -Date: Tue, 3 Aug 2021 17:11:51 +0200 -Subject: [PATCH] Deactivate SSE2 and AVX2 if a CPU has no flags (#242) - -Fixes #277 ---- a/setup.py -+++ b/setup.py -@@ -90,8 +90,8 @@ def cmake_bool(cond): - platforms = ['any'], - cmake_args = [ - '-DBLOSC_DIR:PATH=%s' % os.environ.get('BLOSC_DIR', ''), -- '-DDEACTIVATE_SSE2:BOOL=%s' % cmake_bool(('DISABLE_BLOSC_SSE2' in os.environ) or (cpu_info is None) or ('sse2' not in cpu_info['flags'])), -- '-DDEACTIVATE_AVX2:BOOL=%s' % cmake_bool(('DISABLE_BLOSC_AVX2' in os.environ) or (cpu_info is None) or ('avx2' not in cpu_info['flags'])), -+ '-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'])), -+ '-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'])), - '-DDEACTIVATE_LZ4:BOOL=%s' % cmake_bool(not int(os.environ.get('INCLUDE_LZ4', '1'))), - # Snappy is disabled by default - '-DDEACTIVATE_SNAPPY:BOOL=%s' % cmake_bool(not int(os.environ.get('INCLUDE_SNAPPY', '0'))),
