Date: Fri, 7 Apr 2023 13:59:15 GMT From: Emanuel Haupt <ehaupt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9504824dedc9 - main - devel/mimalloc: Update to 2.1.1 Message-ID: <202304071359.337DxFPo064975@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=9504824dedc9f906d239cabfa1522fc0ffa68b53 commit 9504824dedc9f906d239cabfa1522fc0ffa68b53 Author: Emanuel Haupt <ehaupt@FreeBSD.org> AuthorDate: 2023-04-07 13:59:09 +0000 Commit: Emanuel Haupt <ehaupt@FreeBSD.org> CommitDate: 2023-04-07 13:59:09 +0000 devel/mimalloc: Update to 2.1.1 Upstream issue: https://github.com/microsoft/mimalloc/issues/722 --- devel/mimalloc/Makefile | 3 +-- devel/mimalloc/distinfo | 6 +++--- devel/mimalloc/files/patch-CMakeLists.txt | 8 ++++---- devel/mimalloc/files/patch-src_prim_unix_prim.c | 11 +++++++++++ devel/mimalloc/pkg-plist | 2 +- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/devel/mimalloc/Makefile b/devel/mimalloc/Makefile index 0bd0ac3c114d..64fb57a1040d 100644 --- a/devel/mimalloc/Makefile +++ b/devel/mimalloc/Makefile @@ -1,7 +1,6 @@ PORTNAME= mimalloc DISTVERSIONPREFIX= v -DISTVERSION= 2.0.9 -PORTREVISION= 1 +DISTVERSION= 2.1.1 CATEGORIES= devel MAINTAINER= ehaupt@FreeBSD.org diff --git a/devel/mimalloc/distinfo b/devel/mimalloc/distinfo index 9a77f938e89a..14b553e736a4 100644 --- a/devel/mimalloc/distinfo +++ b/devel/mimalloc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672157511 -SHA256 (microsoft-mimalloc-v2.0.9_GH0.tar.gz) = 4a29edae32a914a706715e2ac8e7e4109e25353212edeed0888f4e3e15db5850 -SIZE (microsoft-mimalloc-v2.0.9_GH0.tar.gz) = 1143452 +TIMESTAMP = 1680853346 +SHA256 (microsoft-mimalloc-v2.1.1_GH0.tar.gz) = 38b9660d0d1b8a732160191609b64057d8ccc3811ab18b7607bc93ca63a6010f +SIZE (microsoft-mimalloc-v2.1.1_GH0.tar.gz) = 1163057 diff --git a/devel/mimalloc/files/patch-CMakeLists.txt b/devel/mimalloc/files/patch-CMakeLists.txt index 7c9fce5c9d33..9c0f325ff0f1 100644 --- a/devel/mimalloc/files/patch-CMakeLists.txt +++ b/devel/mimalloc/files/patch-CMakeLists.txt @@ -1,13 +1,13 @@ ---- CMakeLists.txt.orig 2022-02-15 00:44:33 UTC +--- CMakeLists.txt.orig 2023-04-03 19:32:28 UTC +++ CMakeLists.txt -@@ -258,8 +258,8 @@ else() +@@ -353,8 +353,8 @@ if(MI_TRACK_ASAN) + 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) - list(APPEND mi_build_targets "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..f74eb8199eaa --- /dev/null +++ b/devel/mimalloc/files/patch-src_prim_unix_prim.c @@ -0,0 +1,11 @@ +--- src/prim/unix/prim.c.orig 2023-04-03 19:32:28 UTC ++++ src/prim/unix/prim.c +@@ -169,7 +169,7 @@ static void* unix_mmap_prim(void* addr, size_t size, s + p = mmap(addr, size, protect_flags, flags | MAP_ALIGNED(n), fd, 0); + if (p==MAP_FAILED || !_mi_is_aligned(p,try_alignment)) { + int err = errno; +- _mi_warning_message("unable to directly request aligned OS memory (error: %d (0x%x), size: 0x%zx bytes, alignment: 0x%zx, hint address: %p)\n", err, err, size, try_alignment, hint); ++ _mi_warning_message("unable to directly request aligned OS memory (error: %d (0x%x), size: 0x%zx bytes, alignment: 0x%zx, hint address: %p)\n", err, err, size, try_alignment, addr); + } + if (p!=MAP_FAILED) return p; + // fall back to regular mmap diff --git a/devel/mimalloc/pkg-plist b/devel/mimalloc/pkg-plist index 1365b5fb7855..7b9cc29f8afc 100644 --- a/devel/mimalloc/pkg-plist +++ b/devel/mimalloc/pkg-plist @@ -8,5 +8,5 @@ lib/cmake/mimalloc/mimalloc.cmake lib/libmimalloc.a lib/libmimalloc.so lib/libmimalloc.so.2 -lib/libmimalloc.so.2.0 +lib/libmimalloc.so.2.1 libdata/pkgconfig/mimalloc.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304071359.337DxFPo064975>