commit: f5fbe39656d72a7bc89fc504b2790f403ba8bd37 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Sep 18 09:24:54 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Sep 18 09:37:57 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5fbe396
dev-libs/c-blosc: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-libs/c-blosc/Manifest | 2 - dev-libs/c-blosc/c-blosc-1.11.2.ebuild | 52 ---------------------- dev-libs/c-blosc/c-blosc-1.19.0.ebuild | 50 --------------------- .../files/c-blosc-1.11.2-fix-build-system.patch | 21 --------- dev-libs/c-blosc/files/c-blosc-1.19.0-xgetbv.patch | 33 -------------- 5 files changed, 158 deletions(-) diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest index 3a75b6b4ae3..da7cce1b2da 100644 --- a/dev-libs/c-blosc/Manifest +++ b/dev-libs/c-blosc/Manifest @@ -1,4 +1,2 @@ -DIST c-blosc-1.11.2.tar.gz 633280 BLAKE2B 426de12ffa0db784fc26316e5758836517f3b3498111cfea64ebd2bc4582ebc6236f64845d41e75db272d3741ab8a7f22a12e0847fb7c98ba10a3ae2c2906e22 SHA512 c1282f60f4ef9d24844be225587e7f46c43ba8a5071f5ee49a7326bce9e84b65312c4f9606e78fd3d1209a4ca50f1c31312a7c377caf9522c9915177c92a4d7b -DIST c-blosc-1.19.0.tar.gz 875356 BLAKE2B 046134e10fec639f1271d9c7cc15dcd239f9f0875f7ad324144338072e6fa006612f7d154ccde11a5dd7ee60471380aab4a60ae332cf1de4a7b773ae354c494a SHA512 15bc009f8880630c531ccd36544869d59b69d21f10c08eebf3c2983d203697429649a1b56b044e28342ec620c6f5850ee9da783005ce83f23e783f091289498c DIST c-blosc-1.20.0.tar.gz 878891 BLAKE2B 742619a5de9696646f8c434f25e736dc3662b8215c6397d9e23f7f86ae6df78c014c8b23bfa1cada72f31b99d81b6c9d99eeb28189c529fe692b88f95da1d67a SHA512 b3da9970542c389fce4acb6ffb866c066dfbf542fadb21ed3d6a7688f9cccf89425ccdc9253a1f7172eced224ff27b78be0c9ce111b4b69ec303a61fb7c1bc10 DIST c-blosc-1.20.1.tar.gz 878895 BLAKE2B 54f91ffc0b270f8bc8ace8893c01ab6847096397f76b31c5adf0516903cee29d867973317de5d016807837ac098b170542c0b8e702d386bf9166de31863f6eab SHA512 59f83dfb3f0db6530daeae699f0915d6c8a7186cea1fe2face7110f5c94c2e8ccc12eb0078de968552b6ac32163b2ec6fb19b79966d2c85574a2676b454f5475 diff --git a/dev-libs/c-blosc/c-blosc-1.11.2.ebuild b/dev-libs/c-blosc/c-blosc-1.11.2.ebuild deleted file mode 100644 index 2dbf5d282b3..00000000000 --- a/dev-libs/c-blosc/c-blosc-1.11.2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="Blocking, shuffling and lossless compression library" -HOMEPAGE="https://www.blosc.org/"; -SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" - -SLOT="0/1" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" - -IUSE="cpu_flags_x86_avx2 +lz4 +snappy static-libs test zlib zstd" -RESTRICT="!test? ( test )" - -RDEPEND=" - lz4? ( >=app-arch/lz4-1.7.5:= ) - snappy? ( app-arch/snappy ) - zlib? ( sys-libs/zlib ) - zstd? ( app-arch/zstd )" -DEPEND="${RDEPEND}" - -DOCS=( README.rst RELEASE_NOTES.rst THOUGHTS_FOR_2.0.txt ANNOUNCE.rst ) -PATCHES=( "${FILESDIR}/${PN}-1.11.2-fix-build-system.patch" ) - -src_prepare() { - cmake-utils_src_prepare - # remove bundled libs - rm -rf internal-complibs || die -} - -src_configure() { - local mycmakeargs=( - -DBUILD_STATIC=$(usex static-libs) - -DBUILD_TESTS=$(usex test) - -DBUILD_BENCHMARKS=OFF - -DDEACTIVATE_AVX2=$(usex !cpu_flags_x86_avx2) - -DDEACTIVATE_LZ4=$(usex !lz4) - -DDEACTIVATE_SNAPPY=$(usex !snappy) - -DDEACTIVATE_ZLIB=$(usex !zlib) - -DDEACTIVATE_ZSTD=$(usex !zstd) - -DPREFER_EXTERNAL_LZ4=ON - -DPREFER_EXTERNAL_SNAPPY=ON - -DPREFER_EXTERNAL_ZLIB=ON - -DPREFER_EXTERNAL_ZSTD=ON - ) - cmake-utils_src_configure -} diff --git a/dev-libs/c-blosc/c-blosc-1.19.0.ebuild b/dev-libs/c-blosc/c-blosc-1.19.0.ebuild deleted file mode 100644 index 671a429da43..00000000000 --- a/dev-libs/c-blosc/c-blosc-1.19.0.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Blocking, shuffling and lossless compression library" -HOMEPAGE="https://www.blosc.org/"; -SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/1" -KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="+lz4 +snappy test zlib zstd" -RESTRICT="!test? ( test )" - -RDEPEND=" - lz4? ( >=app-arch/lz4-1.7.5:= ) - snappy? ( app-arch/snappy ) - zlib? ( sys-libs/zlib ) - zstd? ( app-arch/zstd )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-xgetbv.patch -) - -src_prepare() { - cmake_src_prepare - # remove bundled libs - rm -rf internal-complibs || die -} - -src_configure() { - local mycmakeargs=( - -DBUILD_STATIC=OFF - -DBUILD_TESTS=$(usex test) - -DBUILD_BENCHMARKS=OFF - -DDEACTIVATE_LZ4=$(usex !lz4) - -DDEACTIVATE_SNAPPY=$(usex !snappy) - -DDEACTIVATE_ZLIB=$(usex !zlib) - -DDEACTIVATE_ZSTD=$(usex !zstd) - -DPREFER_EXTERNAL_LZ4=ON - # snappy is always external - -DPREFER_EXTERNAL_ZLIB=ON - -DPREFER_EXTERNAL_ZSTD=ON - ) - cmake_src_configure -} diff --git a/dev-libs/c-blosc/files/c-blosc-1.11.2-fix-build-system.patch b/dev-libs/c-blosc/files/c-blosc-1.11.2-fix-build-system.patch deleted file mode 100644 index d385d526371..00000000000 --- a/dev-libs/c-blosc/files/c-blosc-1.11.2-fix-build-system.patch +++ /dev/null @@ -1,21 +0,0 @@ -Make the build system respect CFLAGS - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -244,16 +244,6 @@ - endif() - - # flags --# @TODO: set -Wall --# @NOTE: -O3 is enabled in Release mode (CMAKE_BUILD_TYPE="Release") -- --# Set the "-msse2" build flag only if the CMAKE_C_FLAGS is not already set. --# Probably "-msse2" should be appended to CMAKE_C_FLAGS_RELEASE. --if(CMAKE_C_COMPILER_ID STREQUAL GNU OR CMAKE_C_COMPILER_ID STREQUAL Clang OR CMAKE_C_COMPILER_ID STREQUAL Intel) -- if(NOT CMAKE_C_FLAGS AND COMPILER_SUPPORT_SSE2) -- set(CMAKE_C_FLAGS -msse2 CACHE STRING "C flags." FORCE) -- endif(NOT CMAKE_C_FLAGS AND COMPILER_SUPPORT_SSE2) --endif(CMAKE_C_COMPILER_ID STREQUAL GNU OR CMAKE_C_COMPILER_ID STREQUAL Clang OR CMAKE_C_COMPILER_ID STREQUAL Intel) - - if(MSVC) - if(NOT CMAKE_C_FLAGS) diff --git a/dev-libs/c-blosc/files/c-blosc-1.19.0-xgetbv.patch b/dev-libs/c-blosc/files/c-blosc-1.19.0-xgetbv.patch deleted file mode 100644 index 045a234028b..00000000000 --- a/dev-libs/c-blosc/files/c-blosc-1.19.0-xgetbv.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 14d2d561795c276fc33c8cb54781dff76b398906 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> -Date: Wed, 10 Jun 2020 12:13:39 +0200 -Subject: [PATCH] Redefine blosc_internal_xgetbv for platforms with immintrin.h - -Commit 2f2d876 renamed _xgetbv to blosc_internal_xgetbv. Commit 0b8608b -made it conditional to immintrin.h not being included, apparently -in order to prevent _xgetbv collision. However, since the block -no longer defined _xgetbv but blosc_internal_xgetbv, it means that -the latter is not defined if the condition is false. #define it to -_xgetbv to fix missing symbol. ---- - blosc/shuffle.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/blosc/shuffle.c b/blosc/shuffle.c -index fc2ca64..7a03bf1 100644 ---- a/blosc/shuffle.c -+++ b/blosc/shuffle.c -@@ -195,6 +195,10 @@ blosc_internal_xgetbv(uint32_t xcr) { - return ((uint64_t)edx << 32) | eax; - } - -+#else -+ -+#define blosc_internal_xgetbv _xgetbv -+ - #endif // !(defined(_IMMINTRIN_H_INCLUDED) && (BLOSC_GCC_VERSION >= 900)) - #endif /* defined(_MSC_FULL_VER) */ - --- -2.27.0 -
