summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-09-06 01:10:00 +0100
committerSam James <sam@gentoo.org>2021-09-06 01:10:00 +0100
commit76f9ac47a4e34c05b9c3a5189d4799938f909843 (patch)
tree3b435bc92200ef6fb5805b2b6b423a47ebafcf79 /dev-python
parentapp-crypt/gpgme: backport glibc-2.34 patch (diff)
downloadgentoo-76f9ac47a4e34c05b9c3a5189d4799938f909843.tar.gz
gentoo-76f9ac47a4e34c05b9c3a5189d4799938f909843.tar.bz2
gentoo-76f9ac47a4e34c05b9c3a5189d4799938f909843.zip
dev-python/blosc: fix build on non-amd64/x86 (CPU flags)
Closes: https://bugs.gentoo.org/732178 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/blosc/blosc-1.10.4.ebuild1
-rw-r--r--dev-python/blosc/files/blosc-1.10.4-cpu-flags.patch22
2 files changed, 23 insertions, 0 deletions
diff --git a/dev-python/blosc/blosc-1.10.4.ebuild b/dev-python/blosc/blosc-1.10.4.ebuild
index 8acd8a97e758..e8ef10b43d61 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 000000000000..1e2641646138
--- /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 <ginggs@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'))),