From 30374bb7fde64ecc0c4f734e00815f6401362a26 Mon Sep 17 00:00:00 2001 From: miqlas <5569059+extrowerk@users.noreply.github.com> Date: Mon, 23 Sep 2019 08:06:15 +0200 Subject: [PATCH] BLOSC: bump (#4180) --- ...sc-1.16.3.recipe => c_blosc-1.17.0.recipe} | 5 ++--- .../c_blosc/patches/c_blosc-1.16.3.patchset | 22 ------------------- 2 files changed, 2 insertions(+), 25 deletions(-) rename dev-libs/c_blosc/{c_blosc-1.16.3.recipe => c_blosc-1.17.0.recipe} (95%) delete mode 100644 dev-libs/c_blosc/patches/c_blosc-1.16.3.patchset diff --git a/dev-libs/c_blosc/c_blosc-1.16.3.recipe b/dev-libs/c_blosc/c_blosc-1.17.0.recipe similarity index 95% rename from dev-libs/c_blosc/c_blosc-1.16.3.recipe rename to dev-libs/c_blosc/c_blosc-1.17.0.recipe index 6a10416dc..67f970fe1 100644 --- a/dev-libs/c_blosc/c_blosc-1.16.3.recipe +++ b/dev-libs/c_blosc/c_blosc-1.17.0.recipe @@ -10,10 +10,9 @@ COPYRIGHT="2012-2018 Francesc Alted" LICENSE="MIT" REVISION="1" SOURCE_URI="https://github.com/Blosc/c-blosc/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="bec56cb0956725beb93d50478e918aca09f489f1bfe543dbd3087827a7344396" +CHECKSUM_SHA256="75d98c752b8cf0d4a6380a3089d56523f175b0afa2d0cf724a1bd0a1a8f975a4" SOURCE_FILENAME="c_blosc-$portVersion.tar.gz" SOURCE_DIR="c-blosc-$portVersion" -PATCHES="c_blosc-$portVersion.patchset" ARCHITECTURES="?x86_gcc2 ?x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -70,6 +69,7 @@ BUILD() -DPREFER_EXTERNAL_SNAPPY=ON \ -DPREFER_EXTERNAL_ZLIB=ON \ -DPREFER_EXTERNAL_ZSTD=ON \ + -DDEACTIVATE_AVX2=ON \ -DLIB_SUFFIX=$secondaryArchSubDir \ $cmakeDirArgs @@ -104,6 +104,5 @@ INSTALL() TEST() { cd haiku_build - make test } diff --git a/dev-libs/c_blosc/patches/c_blosc-1.16.3.patchset b/dev-libs/c_blosc/patches/c_blosc-1.16.3.patchset deleted file mode 100644 index 094ff907b..000000000 --- a/dev-libs/c_blosc/patches/c_blosc-1.16.3.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From 96fa0540b618a6ef8609d435eea3ca2a3cd12b83 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Thu, 7 Dec 2017 21:27:35 +0100 -Subject: Build fix - - -diff --git a/tests/test_common.h b/tests/test_common.h -index 148a063..043a059 100644 ---- a/tests/test_common.h -+++ b/tests/test_common.h -@@ -68,7 +68,7 @@ static void* blosc_test_malloc(const size_t alignment, const size_t size) - #elif defined(_WIN32) - /* A (void *) cast needed for avoiding a warning with MINGW :-/ */ - block = (void *)_aligned_malloc(size, alignment); --#elif _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 -+#elif _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__HAIKU__) - /* Platform does have an implementation of posix_memalign */ - res = posix_memalign(&block, alignment, size); - #elif defined(__APPLE__) --- -2.16.2 -