[gentoo-commits] repo/gentoo:master commit in: dev-python/blosc/, dev-python/blosc/files/
commit: 76f9ac47a4e34c05b9c3a5189d4799938f909843
Author: Sam James gentoo org>
AuthorDate: Mon Sep 6 00:10:00 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Sep 6 00:10:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76f9ac47
dev-python/blosc: fix build on non-amd64/x86 (CPU flags)
Closes: https://bugs.gentoo.org/732178
Signed-off-by: Sam James gentoo.org>
dev-python/blosc/blosc-1.10.4.ebuild | 1 +
.../blosc/files/blosc-1.10.4-cpu-flags.patch | 22 ++
2 files changed, 23 insertions(+)
diff --git a/dev-python/blosc/blosc-1.10.4.ebuild
b/dev-python/blosc/blosc-1.10.4.ebuild
index 8acd8a97e75..e8ef10b43d6 100644
--- a/dev-python/blosc/blosc-1.10.4.ebuild
+++ b/dev-python/blosc/blosc-1.10.4.ebuild
@@ -29,6 +29,7 @@ BDEPEND="
DOCS=( ANNOUNCE.rst README.rst RELEASE_NOTES.rst )
PATCHES=(
"${FILESDIR}"/blosc-1.10.0-unbundle.patch
+ "${FILESDIR}"/blosc-1.10.4-cpu-flags.patch
)
python_prepare_all() {
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
new file mode 100644
index 000..1e264164613
--- /dev/null
+++ b/dev-python/blosc/files/blosc-1.10.4-cpu-flags.patch
@@ -0,0 +1,22 @@
+https://github.com/Blosc/python-blosc/commit/70226a70907072be607caee3da472e37a4683bae
+https://github.com/Blosc/python-blosc/issues/227
+https://bugs.gentoo.org/732178
+
+From: Graham Inggs
+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'))),
[gentoo-commits] repo/gentoo:master commit in: dev-python/blosc/, dev-python/blosc/files/
commit: 56b0faee408015634a450c6ce608923497aab644
Author: Michał Górny gentoo org>
AuthorDate: Sun Jan 31 19:52:20 2021 +
Commit: Michał Górny gentoo org>
CommitDate: Sun Jan 31 20:04:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56b0faee
dev-python/blosc: Remove old
Signed-off-by: Michał Górny gentoo.org>
dev-python/blosc/Manifest | 2 -
dev-python/blosc/blosc-1.10.0.ebuild | 46 -
dev-python/blosc/blosc-1.9.2.ebuild | 49 ---
dev-python/blosc/files/blosc-1.9.1-unbundle.patch | 23 ---
4 files changed, 120 deletions(-)
diff --git a/dev-python/blosc/Manifest b/dev-python/blosc/Manifest
index 527dee909a8..4751f705fe7 100644
--- a/dev-python/blosc/Manifest
+++ b/dev-python/blosc/Manifest
@@ -1,4 +1,2 @@
-DIST blosc-1.10.0.tar.gz 845312 BLAKE2B
15f367f1420f56e64ec01e74d7320adc194db11d15bd26a2b78c59c88a6127f1d2b5fc7bd53e02a6d0cad785c87cf79bb909dec62982b5ee8620c92ccdd80249
SHA512
f071d131966acd74cf71f8688ae9830091ee12a92399e8736f2b2cc2243bc022f9fd194c60493e912aef87a54202813a67a8f9bddd90c1c44631205d58c3f3e3
DIST blosc-1.10.1.tar.gz 858162 BLAKE2B
768ae6d438d9fe05589460dcaeea77dbf2e0212bbc67388c6df1b9fc6bd1921e8cd79da2039cd4300cd91923d7988f8c4741ea1dbd5ebfa13e48f3ade678ac09
SHA512
06e393efa3fc7060205a483787eb4c5befe75dfdd6321b37c43ed7830dccf4d622bd88451e97da663ed9dc9302c30d7486315de9aff6351721862e2eceddd9a3
DIST blosc-1.10.2.tar.gz 858096 BLAKE2B
ff314011e1afc2d972c2445df9ad25c245494479201ddd0944ddf5f14aa0aa772c9da1e117eb5395f5488e7238aefe1236d9a5579b4d03be2b041790de9575e8
SHA512
82dab50a49ddd45d8276fd43999233f41b507e35af5897ed4945565fde8f56be0855b0dd926d254bd77904ec7a13ad3f024007159510b677769d97599b731222
-DIST blosc-1.9.2.tar.gz 816897 BLAKE2B
7d1a2d925500c8ddb93975dd785c03b91dec2716a438915d5dfdb739c650de8a47ed80eb25fc55357e69b586c446c5af61212e0a4fba8158839a66849309f478
SHA512
a8f53afb7fb1bb742e2daa03015b636d4dbb1fd073be079022364ec67035c9e6ee372ab07f7ce06579b85d9fcaedd2a11f30b9cf5b2bd1d1ea62cf32a8aa3c1f
diff --git a/dev-python/blosc/blosc-1.10.0.ebuild
b/dev-python/blosc/blosc-1.10.0.ebuild
deleted file mode 100644
index 115df5959d2..000
--- a/dev-python/blosc/blosc-1.10.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="High performance compressor optimized for binary data"
-HOMEPAGE="http://python-blosc.blosc.org;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/c-blosc-1.19.0:="
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-python/scikit-build[${PYTHON_USEDEP}]
- test? (
- dev-python/numpy[${PYTHON_USEDEP}]
- )
-"
-
-DOCS=( ANNOUNCE.rst README.rst RELEASE_NOTES.rst )
-PATCHES=(
- "${FILESDIR}"/blosc-1.10.0-unbundle.patch
-)
-
-python_prepare_all() {
- export BLOSC_DIR="${EPREFIX}/usr"
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- "${EPYTHON}" -m blosc.test -v || die
-}
-
-python_install() {
- distutils-r1_python_install
- python_optimize
-}
diff --git a/dev-python/blosc/blosc-1.9.2.ebuild
b/dev-python/blosc/blosc-1.9.2.ebuild
deleted file mode 100644
index f09441ce889..000
--- a/dev-python/blosc/blosc-1.9.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="High performance compressor optimized for binary data"
-HOMEPAGE="http://python-blosc.blosc.org;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/c-blosc-1.19.0:="
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-python/scikit-build[${PYTHON_USEDEP}]
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/blosc-1.9.1-unbundle.patch
-)
-
-python_prepare_all() {
- export BLOSC_DIR="${EPREFIX}/usr"
- distutils-r1_python_prepare_all
- DOCS=( ANNOUNCE.rst README.rst RELEASE_NOTES.rst )
-}
-
-python_test() {
- cd "${BUILD_DIR}"/lib || die
- PYTHONPATH=. nosetests -v || die
-}
-
-python_install() {
- distutils-r1_python_install
- python_optimize
-}
diff --git a/dev-python/blosc/files/blosc-1.9.1-unbundle.patch
b/dev-python/blosc/files/blosc-1.9.1-unbundle.patch
deleted file mode 100644
index 55af5f0c621..000
---
[gentoo-commits] repo/gentoo:master commit in: dev-python/blosc/, dev-python/blosc/files/
commit: 005d860137c26db588503516ffa584f79b2dee78
Author: Michał Górny gentoo org>
AuthorDate: Thu Dec 24 00:19:23 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Dec 24 00:19:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=005d8601
dev-python/blosc: Bump to 1.10.0
Signed-off-by: Michał Górny gentoo.org>
dev-python/blosc/Manifest | 1 +
dev-python/blosc/blosc-1.10.0.ebuild | 46 ++
dev-python/blosc/files/blosc-1.10.0-unbundle.patch | 38 ++
3 files changed, 85 insertions(+)
diff --git a/dev-python/blosc/Manifest b/dev-python/blosc/Manifest
index e8bdd9e7727..4bb979ce2e5 100644
--- a/dev-python/blosc/Manifest
+++ b/dev-python/blosc/Manifest
@@ -1 +1,2 @@
+DIST blosc-1.10.0.tar.gz 845312 BLAKE2B
15f367f1420f56e64ec01e74d7320adc194db11d15bd26a2b78c59c88a6127f1d2b5fc7bd53e02a6d0cad785c87cf79bb909dec62982b5ee8620c92ccdd80249
SHA512
f071d131966acd74cf71f8688ae9830091ee12a92399e8736f2b2cc2243bc022f9fd194c60493e912aef87a54202813a67a8f9bddd90c1c44631205d58c3f3e3
DIST blosc-1.9.2.tar.gz 816897 BLAKE2B
7d1a2d925500c8ddb93975dd785c03b91dec2716a438915d5dfdb739c650de8a47ed80eb25fc55357e69b586c446c5af61212e0a4fba8158839a66849309f478
SHA512
a8f53afb7fb1bb742e2daa03015b636d4dbb1fd073be079022364ec67035c9e6ee372ab07f7ce06579b85d9fcaedd2a11f30b9cf5b2bd1d1ea62cf32a8aa3c1f
diff --git a/dev-python/blosc/blosc-1.10.0.ebuild
b/dev-python/blosc/blosc-1.10.0.ebuild
new file mode 100644
index 000..1423adda4bd
--- /dev/null
+++ b/dev-python/blosc/blosc-1.10.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="High performance compressor optimized for binary data"
+HOMEPAGE="http://python-blosc.blosc.org;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-libs/c-blosc-1.19.0:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-python/scikit-build[${PYTHON_USEDEP}]
+ test? (
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )
+"
+
+DOCS=( ANNOUNCE.rst README.rst RELEASE_NOTES.rst )
+PATCHES=(
+ "${FILESDIR}"/blosc-1.10.0-unbundle.patch
+)
+
+python_prepare_all() {
+ export BLOSC_DIR="${EPREFIX}/usr"
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ "${EPYTHON}" -m blosc.test -v || die
+}
+
+python_install() {
+ distutils-r1_python_install
+ python_optimize
+}
diff --git a/dev-python/blosc/files/blosc-1.10.0-unbundle.patch
b/dev-python/blosc/files/blosc-1.10.0-unbundle.patch
new file mode 100644
index 000..0ea6740f9c0
--- /dev/null
+++ b/dev-python/blosc/files/blosc-1.10.0-unbundle.patch
@@ -0,0 +1,38 @@
+From b2935461d889eac99fa1bdfb04a96f1c3a23c4c3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=
+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
+
