CVS commit: pkgsrc/devel/mimalloc

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jan 13 10:35:59 UTC 2025

Modified Files:
        pkgsrc/devel/mimalloc: Makefile PLIST distinfo
Added Files:
        pkgsrc/devel/mimalloc/patches: patch-src_prim_unix_prim.c

Log Message:
mimalloc: updated to 3.0.1

3.0.1
minor update


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/mimalloc/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/mimalloc/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/mimalloc/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/mimalloc/patches/patch-src_prim_unix_prim.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/mimalloc/Makefile
diff -u pkgsrc/devel/mimalloc/Makefile:1.11 pkgsrc/devel/mimalloc/Makefile:1.12
--- pkgsrc/devel/mimalloc/Makefile:1.11 Sun Aug 25 06:18:36 2024
+++ pkgsrc/devel/mimalloc/Makefile      Mon Jan 13 10:35:58 2025
@@ -1,27 +1,30 @@
-# $NetBSD: Makefile,v 1.11 2024/08/25 06:18:36 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2025/01/13 10:35:58 adam Exp $
 
-DISTNAME=      mimalloc-2.0.9
+DISTNAME=      mimalloc-3.0.1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=microsoft/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://github.com/microsoft/mimalloc/
+HOMEPAGE=      https://github.com/microsoft/mimalloc
 COMMENT=       General-purpose allocator with excellent performance characteristics
 LICENSE=       mit
 
-USE_CMAKE=     yes
-USE_LANGUAGES= c c++
+USE_CC_FEATURES=       c11
+USE_CXX_FEATURES=      c++17
+USE_LANGUAGES=         c c++
+TEST_ENV+=             LD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}
+# For Darwin
+TEST_ENV+=             DYLD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}
+TEST_TARGET=           test
 
 CMAKE_CONFIGURE_ARGS+= -DMI_INSTALL_TOPLEVEL=ON
 
-# Requires stdatomic support.
-USE_CC_FEATURES+=      c11
-
 INSTALLATION_DIRS+=    lib/cmake/mimalloc
 
 post-install:
        ${RM} -f ${DESTDIR}${PREFIX}/lib/mimalloc.o
 
+.include "../../devel/cmake/build.mk"
 .include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/mimalloc/PLIST
diff -u pkgsrc/devel/mimalloc/PLIST:1.5 pkgsrc/devel/mimalloc/PLIST:1.6
--- pkgsrc/devel/mimalloc/PLIST:1.5     Mon Jan  9 17:13:43 2023
+++ pkgsrc/devel/mimalloc/PLIST Mon Jan 13 10:35:58 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2023/01/09 17:13:43 fcambus Exp $
+@comment $NetBSD: PLIST,v 1.6 2025/01/13 10:35:58 adam Exp $
 include/mimalloc-new-delete.h
 include/mimalloc-override.h
 include/mimalloc.h
@@ -8,6 +8,6 @@ lib/cmake/mimalloc/mimalloc-release.cmak
 lib/cmake/mimalloc/mimalloc.cmake
 lib/libmimalloc.a
 lib/libmimalloc.so
-lib/libmimalloc.so.2
-lib/libmimalloc.so.2.0
+lib/libmimalloc.so.3
+lib/libmimalloc.so.3.0
 lib/pkgconfig/mimalloc.pc

Index: pkgsrc/devel/mimalloc/distinfo
diff -u pkgsrc/devel/mimalloc/distinfo:1.7 pkgsrc/devel/mimalloc/distinfo:1.8
--- pkgsrc/devel/mimalloc/distinfo:1.7  Mon Jan  9 17:13:43 2023
+++ pkgsrc/devel/mimalloc/distinfo      Mon Jan 13 10:35:58 2025
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2023/01/09 17:13:43 fcambus Exp $
+$NetBSD: distinfo,v 1.8 2025/01/13 10:35:58 adam Exp $
 
-BLAKE2s (mimalloc-2.0.9.tar.gz) = 4afa792094fdff0f6b4935ea517a1b48a9e59f4c9aee10b88b21c5b1f1bab8ac
-SHA512 (mimalloc-2.0.9.tar.gz) = bf6945bfb600ade35dab34c7f570ee4f69a77612547ad874bbbd989a4e594a6a219c222a22c90c5e36f205aae4d5cd1a5e4651caed5433db275d414c6769bf49
-Size (mimalloc-2.0.9.tar.gz) = 1143452 bytes
+BLAKE2s (mimalloc-3.0.1.tar.gz) = f0653aba6c3bb2cfc9964c8879a5c2b06ff6bb86ebb4e8e5b3c9ae76417b22c0
+SHA512 (mimalloc-3.0.1.tar.gz) = ba51cf9af3ef41728c94b72805bf8915e63910b32cb9ab331445ec28404d048c0737646e02c08dc0f0e958c526fe894e275b96326fa041a157e3e88f39f2b673
+Size (mimalloc-3.0.1.tar.gz) = 1281782 bytes
+SHA1 (patch-src_prim_unix_prim.c) = 48a79b89595f2c3d9b064bdb0876450942714169

Added files:

Index: pkgsrc/devel/mimalloc/patches/patch-src_prim_unix_prim.c
diff -u /dev/null pkgsrc/devel/mimalloc/patches/patch-src_prim_unix_prim.c:1.1
--- /dev/null   Mon Jan 13 10:35:59 2025
+++ pkgsrc/devel/mimalloc/patches/patch-src_prim_unix_prim.c    Mon Jan 13 10:35:59 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_prim_unix_prim.c,v 1.1 2025/01/13 10:35:59 adam Exp $
+
+Fix build.
+https://github.com/microsoft/mimalloc/issues/988
+
+--- src/prim/unix/prim.c.orig  2025-01-13 10:00:52.394506291 +0000
++++ src/prim/unix/prim.c
+@@ -201,7 +201,8 @@ static void* unix_mmap_prim(void* addr, 
+   void* p = NULL;
+   #if defined(MAP_ALIGNED)  // BSD
+   if (addr == NULL && try_alignment > 1 && (try_alignment % _mi_os_page_size()) == 0) {
+-    size_t n = mi_bsr(try_alignment);
++    size_t idx;
++    size_t n = mi_bsr(try_alignment, &idx);
+     if (((size_t)1 << n) == try_alignment && n >= 12 && n <= 30) {  // alignment is a power of 2 and 4096 <= alignment <= 1GiB
+       p = mmap(addr, size, protect_flags, flags | MAP_ALIGNED(n), fd, 0);
+       if (p==MAP_FAILED || !_mi_is_aligned(p,try_alignment)) {