Thursday, November 19, 2026

Re: archivers/blosc2 3.7.0

On 19.11.2026 19:35, Martijn van Duren wrote: > Did you look at my diff here[0] to make it build on alpha? > If so, I can see if it builds there. > > martijn@ > > [0] https://marc.info/?l=openbsd-ports&m=179416258678246&w=2 New diff attached for 3.7.0 which always sets -D_XOPEN_SOURCE=600 like also written in the comment upstream (for BSDs). I also made a change in the mincore() patch. Building fine on amd64. Index: Makefile =================================================================== RCS file: /cvs/ports/archivers/blosc2/Makefile,v retrieving revision 1.11 diff -u -p -r1.11 Makefile --- Makefile 20 Sep 2026 15:35:58 -0000 1.11 +++ Makefile 19 Nov 2026 19:29:07 -0000 @@ -1,9 +1,11 @@ -V = 2.23.1 COMMENT = fast, compressed, persistent binary data store library for C + +V = 3.7.0 PKGNAME = blosc2-${V} + CATEGORIES = archivers -SHARED_LIBS += blosc2 6.0 # 0.0 +SHARED_LIBS += blosc2 7.0 # 0.0 GH_ACCOUNT = Blosc GH_PROJECT = c-blosc2 @@ -15,7 +17,7 @@ MAINTAINER = Martin Reindl <martin@catai # BSD PERMIT_PACKAGE = Yes -WANTLIB += m lz4 pthread z zstd +WANTLIB += m lz4 pthread z zfp zstd COMPILER = base-clang ports-gcc COMPILER_LANGS = c @@ -23,10 +25,9 @@ COMPILER_LANGS = c MODULES = devel/cmake LIB_DEPENDS = archivers/lz4 \ - archivers/zstd + archivers/zstd \ + devel/zfp -CONFIGURE_ARGS = -DPREFER_EXTERNAL_LZ4=ON \ - -DPREFER_EXTERNAL_ZLIB=ON \ - -DPREFER_EXTERNAL_ZSTD=ON +CONFIGURE_ARGS = -DBLOSC_DEPENDENCY_MODE=EXTERNAL .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/archivers/blosc2/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- distinfo 14 Mar 2026 09:41:24 -0000 1.8 +++ distinfo 19 Nov 2026 19:29:07 -0000 @@ -1,2 +1,2 @@ -SHA256 (c-blosc2-2.23.1.tar.gz) = OhpV0eN5T7K1GhLnItYRs+V3RDq7f/mVFmZRH1duo9o= -SIZE (c-blosc2-2.23.1.tar.gz) = 3338640 +SHA256 (c-blosc2-3.7.0.tar.gz) = xospCsmDYZQdqI1lgawnZomgbgi22l6QvIQDqbCIsJI= +SIZE (c-blosc2-3.7.0.tar.gz) = 2200899 Index: patches/patch-CMakeLists_txt =================================================================== RCS file: patches/patch-CMakeLists_txt diff -N patches/patch-CMakeLists_txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-CMakeLists_txt 19 Nov 2026 19:29:07 -0000 @@ -0,0 +1,19 @@ +Index: CMakeLists.txt +--- CMakeLists.txt.orig ++++ CMakeLists.txt +@@ -661,14 +661,7 @@ if(CMAKE_C_COMPILER_ID MATCHES GNU|Clang|Intel|IntelLL + endif() + endif() + +-if(CMAKE_C_COMPILER_ID MATCHES Intel|IntelLLVM|Clang OR HAIKU) +- # We need to tell Intel and Clang compilers about what level of POSIX they support. +- # Note this cannot be dropped on the BSDs even though it hides their BSD extensions +- # (see the _XOPEN_SOURCE handling at the top of frame.c): my_malloc() in blosc2.c +- # keys the posix_memalign() path off it, and there is nothing else defining +- # _POSIX_C_SOURCE there, so dropping it would silently fall back to plain malloc(). +- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE=600") +-endif() ++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE=600") + + if(MSVC) + if(NOT CMAKE_C_FLAGS) Index: patches/patch-bench_CMakeLists_txt =================================================================== RCS file: /cvs/ports/archivers/blosc2/patches/patch-bench_CMakeLists_txt,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-bench_CMakeLists_txt --- patches/patch-bench_CMakeLists_txt 5 Apr 2024 08:53:54 -0000 1.1.1.1 +++ patches/patch-bench_CMakeLists_txt 19 Nov 2026 19:29:07 -0000 @@ -1,12 +1,21 @@ Index: bench/CMakeLists.txt --- bench/CMakeLists.txt.orig +++ bench/CMakeLists.txt -@@ -26,7 +26,7 @@ add_executable(sum_openmp ${SOURCES_SUM_OPENMP}) - add_executable(zero_runlen ${SOURCES_ZERO_RUNLEN}) - add_executable(create_frame ${SOURCES_CFRAME}) +@@ -30,7 +30,7 @@ add_executable(create_frame ${SOURCES_CFRAME}) add_executable(sframe_bench ${SOURCES_SFRAME}) + add_executable(get_sparse ${SOURCES_GET_SPARSE}) + add_executable(frame_lock_bench ${SOURCES_FRAME_LOCK}) -if(UNIX AND NOT APPLE) +if(UNIX AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") # cmake is complaining about LINK_PRIVATE in original PR # and removing it does not seem to hurt, so be it. # target_link_libraries(b2bench LINK_PRIVATE rt) +@@ -62,7 +62,7 @@ target_link_libraries(frame_lock_bench blosc_testing) + + add_executable(bench_compact_tail bench_compact_tail.c) + target_link_libraries(bench_compact_tail blosc_testing) +-if(UNIX AND NOT APPLE) ++if(UNIX AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") + target_link_libraries(bench_compact_tail rt) + endif() + Index: patches/patch-blosc_CMakeLists_txt =================================================================== RCS file: /cvs/ports/archivers/blosc2/patches/patch-blosc_CMakeLists_txt,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-blosc_CMakeLists_txt --- patches/patch-blosc_CMakeLists_txt 5 Apr 2024 08:53:54 -0000 1.1.1.1 +++ patches/patch-blosc_CMakeLists_txt 19 Nov 2026 19:29:07 -0000 @@ -1,7 +1,7 @@ Index: blosc/CMakeLists.txt --- blosc/CMakeLists.txt.orig +++ blosc/CMakeLists.txt -@@ -234,7 +234,9 @@ if(HAVE_IPP) +@@ -172,7 +172,9 @@ if(BUILD_PLUGINS AND TARGET zfp) endif() if(UNIX AND NOT APPLE) Index: patches/patch-blosc_prefetch_c =================================================================== RCS file: patches/patch-blosc_prefetch_c diff -N patches/patch-blosc_prefetch_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-blosc_prefetch_c 19 Nov 2026 19:29:07 -0000 @@ -0,0 +1,22 @@ +Index: blosc/prefetch.c +--- blosc/prefetch.c.orig ++++ blosc/prefetch.c +@@ -560,6 +560,7 @@ static void cache_query_destroy(cache_query *q) { + cross a multiple of CHECK_NBYTES. Only the pages to be read are asked about: the kernel looks at each of them, and + the chunks of one slice can lie far apart. */ + static bool is_cached(const cache_query *q, int64_t start, int64_t stop) { ++#if defined(__linux__) + int64_t first = (start - q->lo) / q->page * q->page; // start of the first page, relative to lo + int64_t npages = (stop - q->lo - first + q->page - 1) / q->page; + #if defined(SYS_cachestat) +@@ -579,7 +580,9 @@ static bool is_cached(const cache_query *q, int64_t st + return false; + } + } +- return true; ++

No comments:

Post a Comment