diff --git a/devel/mimalloc/Makefile b/devel/mimalloc/Makefile index 3aa4ac5059c1..1d3385f669fa 100644 --- a/devel/mimalloc/Makefile +++ b/devel/mimalloc/Makefile @@ -1,26 +1,26 @@ PORTNAME= mimalloc DISTVERSIONPREFIX= v -DISTVERSION= 2.1.8 +DISTVERSION= 3.0.1 CATEGORIES= devel MAINTAINER= ehaupt@FreeBSD.org COMMENT= General-purpose allocator with excellent performance characteristics WWW= https://github.com/microsoft/mimalloc LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake:testing compiler:c++17-lang pathfix USE_GITHUB= yes GH_ACCOUNT= microsoft USE_LDCONFIG= yes CMAKE_ON= MI_INSTALL_TOPLEVEL CMAKE_OFF= MI_BUILD_OBJECT MI_BUILD_TESTS CMAKE_TESTING_ON= MI_BUILD_TESTS # ci pipeline creates transient tags PORTSCOUT= ignore:1 .include diff --git a/devel/mimalloc/distinfo b/devel/mimalloc/distinfo index 08d69587a3be..d1b7a49f47cd 100644 --- a/devel/mimalloc/distinfo +++ b/devel/mimalloc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1735990751 -SHA256 (microsoft-mimalloc-v2.1.8_GH0.tar.gz) = 4d7e771b51ba0d3c4a5850d3f7f7f82c1b04af318e1351553f46aa3336439540 -SIZE (microsoft-mimalloc-v2.1.8_GH0.tar.gz) = 1276091 +TIMESTAMP = 1736781220 +SHA256 (microsoft-mimalloc-v3.0.1_GH0.tar.gz) = 6a514ae31254b43e06e2a89fe1cbc9c447fdbf26edc6f794f3eb722f36e28261 +SIZE (microsoft-mimalloc-v3.0.1_GH0.tar.gz) = 1281782 diff --git a/devel/mimalloc/files/patch-CMakeLists.txt b/devel/mimalloc/files/patch-CMakeLists.txt index 9c0f325ff0f1..a6bc3850f094 100644 --- a/devel/mimalloc/files/patch-CMakeLists.txt +++ b/devel/mimalloc/files/patch-CMakeLists.txt @@ -1,13 +1,13 @@ ---- CMakeLists.txt.orig 2023-04-03 19:32:28 UTC +--- CMakeLists.txt.orig 2025-01-13 15:16:06 UTC +++ CMakeLists.txt -@@ -353,8 +353,8 @@ if(MI_TRACK_ASAN) +@@ -513,8 +513,8 @@ string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_ set(mi_basename "${mi_basename}-asan") endif() string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LC) -if(NOT(CMAKE_BUILD_TYPE_LC MATCHES "^(release|relwithdebinfo|minsizerel|none)$")) - set(mi_basename "${mi_basename}-${CMAKE_BUILD_TYPE_LC}") #append build type (e.g. -debug) if not a release version +if(NOT(CMAKE_BUILD_TYPE_LC MATCHES "^(debug|release|relwithdebinfo|minsizerel|none)$")) + set(mi_basename "${mi_basename}-${CMAKE_BUILD_TYPE_LC}") #append build type if not a release version or debug endif() if(MI_BUILD_SHARED) diff --git a/devel/mimalloc/files/patch-src_prim_unix_prim.c b/devel/mimalloc/files/patch-src_prim_unix_prim.c new file mode 100644 index 000000000000..53ee443d4dee --- /dev/null +++ b/devel/mimalloc/files/patch-src_prim_unix_prim.c @@ -0,0 +1,12 @@ +--- src/prim/unix/prim.c.orig 2025-01-04 04:21:48 UTC ++++ src/prim/unix/prim.c +@@ -201,7 +201,8 @@ static void* unix_mmap_prim(void* addr, size_t size, s + 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)) { diff --git a/devel/mimalloc/pkg-plist b/devel/mimalloc/pkg-plist index 7b9cc29f8afc..780f28538d8f 100644 --- a/devel/mimalloc/pkg-plist +++ b/devel/mimalloc/pkg-plist @@ -1,12 +1,12 @@ include/mimalloc-new-delete.h include/mimalloc-override.h include/mimalloc.h lib/cmake/mimalloc/mimalloc-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/mimalloc/mimalloc-config-version.cmake lib/cmake/mimalloc/mimalloc-config.cmake lib/cmake/mimalloc/mimalloc.cmake lib/libmimalloc.a lib/libmimalloc.so -lib/libmimalloc.so.2 -lib/libmimalloc.so.2.1 +lib/libmimalloc.so.3 +lib/libmimalloc.so.3.0 libdata/pkgconfig/mimalloc.pc