From b091a5c39d7fc2b7003c803f69f8a3ba87231d58 Mon Sep 17 00:00:00 2001 From: miqlas <5569059+extrowerk@users.noreply.github.com> Date: Sun, 20 May 2018 05:30:37 +0200 Subject: [PATCH] C-Blosc : bump (#2546) --- dev-libs/c_blosc/c_blosc-1.12.1.recipe | 95 ------------------- ...sc-1.13.7.recipe => c_blosc-1.14.3.recipe} | 11 ++- .../c_blosc/patches/c_blosc-1.12.1.patchset | 59 ------------ .../c_blosc/patches/c_blosc-1.13.7.patchset | 59 ------------ .../c_blosc/patches/c_blosc-1.14.3.patchset | 22 +++++ 5 files changed, 29 insertions(+), 217 deletions(-) delete mode 100644 dev-libs/c_blosc/c_blosc-1.12.1.recipe rename dev-libs/c_blosc/{c_blosc-1.13.7.recipe => c_blosc-1.14.3.recipe} (88%) delete mode 100644 dev-libs/c_blosc/patches/c_blosc-1.12.1.patchset delete mode 100644 dev-libs/c_blosc/patches/c_blosc-1.13.7.patchset create mode 100644 dev-libs/c_blosc/patches/c_blosc-1.14.3.patchset diff --git a/dev-libs/c_blosc/c_blosc-1.12.1.recipe b/dev-libs/c_blosc/c_blosc-1.12.1.recipe deleted file mode 100644 index 0f6d5f359..000000000 --- a/dev-libs/c_blosc/c_blosc-1.12.1.recipe +++ /dev/null @@ -1,95 +0,0 @@ -SUMMARY="Blocking, shuffling and lossless compression library" -DESCRIPTION="Blosc is a high performance compressor optimized for binary \ -data. It has been designed to transmit data to the processor cache faster \ -than the traditional, non-compressed, direct memory fetch approach via a \ -memcpy() OS call. Blosc is the first compressor (that I'm aware of) that is \ -meant not only to reduce the size of large datasets on-disk or in-memory, but \ -also to accelerate memory-bound computations." -HOMEPAGE="http://www.blosc.org" -COPYRIGHT="2012-2017 Francesc Alted" -LICENSE="MIT" -REVISION="1" -SOURCE_URI="https://github.com/Blosc/c-blosc/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="e04535e816bb942bedc9a0ba209944d1eb34e26e2d9cca37f114e8ee292cb3c8" -SOURCE_DIR="c-blosc-$portVersion" -PATCHES="c_blosc-$portVersion.patchset" - -ARCHITECTURES="?x86_gcc2 ?x86 x86_64" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - c_blosc$secondaryArchSuffix = $portVersion compat >= 1 - lib:libblosc$secondaryArchSuffix = 1.12.1 compat >= 1 - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:liblz4$secondaryArchSuffix - lib:libsnappy$secondaryArchSuffix - lib:libz$secondaryArchSuffix - lib:libzstd$secondaryArchSuffix - " - -PROVIDES_devel=" - c_blosc${secondaryArchSuffix}_devel = $portVersion - devel:libblosc${secondaryArchSuffix} = 1.12.1 compat >= 1 - " -REQUIRES_devel=" - c_blosc${secondaryArchSuffix} == $portVersion base - " - -BUILD_REQUIRES=" - devel:liblz4$secondaryArchSuffix - devel:libsnappy$secondaryArchSuffix - devel:libz$secondaryArchSuffix - devel:libzstd$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel - cmd:gcc${secondaryArchSuffix} - cmd:ld${secondaryArchSuffix} - cmd:cmake - cmd:make - cmd:perl >= 5 - cmd:sed - " - -BUILD() -{ - mkdir -p haiku_build - cd haiku_build - - cmake .. \ - -DPREFER_EXTERNAL_LZ4=ON \ - -DPREFER_EXTERNAL_SNAPPY=ON \ - -DPREFER_EXTERNAL_ZLIB=ON \ - -DPREFER_EXTERNAL_ZSTD=ON \ - $cmakeDirArgs - - make ${jobArgs} -} - -INSTALL() -{ - cd haiku_build - - make install - - # move include dir to correct location - mkdir -p $(dirname $includeDir) - mv $prefix/include $includeDir - - # prepare develop/lib - prepareInstalledDevelLibs libblosc - fixPkgconfig - - # devel package - packageEntries devel \ - $developDir -} - -TEST() -{ - cd haiku_build - - make test -} diff --git a/dev-libs/c_blosc/c_blosc-1.13.7.recipe b/dev-libs/c_blosc/c_blosc-1.14.3.recipe similarity index 88% rename from dev-libs/c_blosc/c_blosc-1.13.7.recipe rename to dev-libs/c_blosc/c_blosc-1.14.3.recipe index d944986c5..faa8ea362 100644 --- a/dev-libs/c_blosc/c_blosc-1.13.7.recipe +++ b/dev-libs/c_blosc/c_blosc-1.14.3.recipe @@ -10,7 +10,7 @@ COPYRIGHT="2012-2017 Francesc Alted" LICENSE="MIT" REVISION="1" SOURCE_URI="https://github.com/Blosc/c-blosc/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="a27005c242a496f7a208fe0a2c6bf2a6956b0d30e87fb1217a5f33e807e90dde" +CHECKSUM_SHA256="7217659d8ef383999d90207a98c9a2555f7b46e10fa7d21ab5a1f92c861d18f7" SOURCE_FILENAME="c_blosc-$portVersion.tar.gz" SOURCE_DIR="c-blosc-$portVersion" PATCHES="c_blosc-$portVersion.patchset" @@ -57,6 +57,9 @@ BUILD_PREREQUIRES=" cmd:sed " +defineDebugInfoPackage c_blosc$secondaryArchSuffix \ + "$libDir"/libblosc.so.$portVersion + BUILD() { mkdir -p haiku_build @@ -67,6 +70,7 @@ BUILD() -DPREFER_EXTERNAL_SNAPPY=ON \ -DPREFER_EXTERNAL_ZLIB=ON \ -DPREFER_EXTERNAL_ZSTD=ON \ + -DLIB_SUFFIX=$secondaryArchSubDir \ $cmakeDirArgs make $jobArgs @@ -83,10 +87,9 @@ INSTALL() mv $prefix/include $includeDir if [ -n "$secondaryArchSuffix" ]; then - # On secondary arch libs should go to $libDir + # On secondary arch the pkgconfig subdir should also go to $libDir # instead of $prefix/lib - mkdir -p $libDir - mv $prefix/lib/* $libDir + mv "$prefix"/lib/pkgconfig "$libDir" fi # prepare develop/lib diff --git a/dev-libs/c_blosc/patches/c_blosc-1.12.1.patchset b/dev-libs/c_blosc/patches/c_blosc-1.12.1.patchset deleted file mode 100644 index f8b3d6d28..000000000 --- a/dev-libs/c_blosc/patches/c_blosc-1.12.1.patchset +++ /dev/null @@ -1,59 +0,0 @@ -From d014d1b144f867dbfc158eea1f45d26f9a35bf58 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: [PATCH] Build fix - ---- - bench/CMakeLists.txt | 4 ++-- - bench/bench.c | 2 +- - tests/test_common.h | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/bench/CMakeLists.txt b/bench/CMakeLists.txt -index 14e74de..1aad1f6 100644 ---- a/bench/CMakeLists.txt -+++ b/bench/CMakeLists.txt -@@ -4,12 +4,12 @@ set(SOURCES bench.c) - - # targets - add_executable(bench ${SOURCES}) --if(UNIX AND NOT APPLE) -+if(UNIX AND NOT APPLE AND NOT HAIKU) - # cmake is complaining about LINK_PRIVATE in original PR - # and removing it does not seem to hurt, so be it. - # target_link_libraries(bench LINK_PRIVATE rt) - target_link_libraries(bench rt) --endif(UNIX AND NOT APPLE) -+endif(UNIX AND NOT APPLE AND NOT HAIKU) - target_link_libraries(bench blosc_shared) - - # have to copy blosc dlls on Windows -diff --git a/bench/bench.c b/bench/bench.c -index 9852313..4c6196a 100644 ---- a/bench/bench.c -+++ b/bench/bench.c -@@ -36,7 +36,7 @@ - #include - #include - #include --#elif defined(__unix__) -+#elif defined(__unix__) || defined(__HAIKU__) - #include - #if defined(__GLIBC__) - #include -diff --git a/tests/test_common.h b/tests/test_common.h -index 4e40533..7ed56f7 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.15.0 - diff --git a/dev-libs/c_blosc/patches/c_blosc-1.13.7.patchset b/dev-libs/c_blosc/patches/c_blosc-1.13.7.patchset deleted file mode 100644 index f8b3d6d28..000000000 --- a/dev-libs/c_blosc/patches/c_blosc-1.13.7.patchset +++ /dev/null @@ -1,59 +0,0 @@ -From d014d1b144f867dbfc158eea1f45d26f9a35bf58 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: [PATCH] Build fix - ---- - bench/CMakeLists.txt | 4 ++-- - bench/bench.c | 2 +- - tests/test_common.h | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/bench/CMakeLists.txt b/bench/CMakeLists.txt -index 14e74de..1aad1f6 100644 ---- a/bench/CMakeLists.txt -+++ b/bench/CMakeLists.txt -@@ -4,12 +4,12 @@ set(SOURCES bench.c) - - # targets - add_executable(bench ${SOURCES}) --if(UNIX AND NOT APPLE) -+if(UNIX AND NOT APPLE AND NOT HAIKU) - # cmake is complaining about LINK_PRIVATE in original PR - # and removing it does not seem to hurt, so be it. - # target_link_libraries(bench LINK_PRIVATE rt) - target_link_libraries(bench rt) --endif(UNIX AND NOT APPLE) -+endif(UNIX AND NOT APPLE AND NOT HAIKU) - target_link_libraries(bench blosc_shared) - - # have to copy blosc dlls on Windows -diff --git a/bench/bench.c b/bench/bench.c -index 9852313..4c6196a 100644 ---- a/bench/bench.c -+++ b/bench/bench.c -@@ -36,7 +36,7 @@ - #include - #include - #include --#elif defined(__unix__) -+#elif defined(__unix__) || defined(__HAIKU__) - #include - #if defined(__GLIBC__) - #include -diff --git a/tests/test_common.h b/tests/test_common.h -index 4e40533..7ed56f7 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.15.0 - diff --git a/dev-libs/c_blosc/patches/c_blosc-1.14.3.patchset b/dev-libs/c_blosc/patches/c_blosc-1.14.3.patchset new file mode 100644 index 000000000..094ff907b --- /dev/null +++ b/dev-libs/c_blosc/patches/c_blosc-1.14.3.patchset @@ -0,0 +1,22 @@ +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 +