mimalloc: update to 2.2.4 (#24909)

Both patches have been upstreamed and are not required anymore. See
<797ca19ba9>
and
<34cc5c8fd9>.
This commit is contained in:
Dirk Stolle 2025-07-22 06:26:00 +02:00 committed by GitHub
parent 9dff2ff702
commit 02cd794b7f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 53 deletions

View File

@ -1,11 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -582,7 +582,7 @@
install(TARGETS mimalloc EXPORT mimalloc ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir})
- if(WIN32)
+ if(WIN32 AND NOT MINGW)
# On windows, the import library name for the dll would clash with the static mimalloc.lib library
# so we postfix the dll import library with `.dll.lib` (and also the .pdb debug file)
set_property(TARGET mimalloc PROPERTY ARCHIVE_OUTPUT_NAME "${mi_libname}.dll" )

View File

@ -1,27 +0,0 @@
From d2c834f3f37f5e473002def7fbf4cf0c567dcdb8 Mon Sep 17 00:00:00 2001
From: Peiyuan Song <squallatf@gmail.com>
Date: Mon, 24 Mar 2025 09:39:42 +0800
Subject: [PATCH] remove the `lib` prefix when enabling mimalloc-redirect for
mingw
---
CMakeLists.txt | 3 +++
1 file changed, 3 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d780fa1..e5c5f46a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -592,6 +592,9 @@ if(MI_BUILD_SHARED)
# install(FILES "$<TARGET_FILE_DIR:mimalloc>/${mi_libname}.dll.pdb" DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()
if(WIN32 AND MI_WIN_REDIRECT)
+ if(MINGW)
+ set_property(TARGET mimalloc PROPERTY PREFIX "")
+ endif()
# On windows, link and copy the mimalloc redirection dll too.
if(CMAKE_GENERATOR_PLATFORM STREQUAL "arm64ec")
set(MIMALLOC_REDIRECT_SUFFIX "-arm64ec")
--
2.49.0.windows.1

View File

@ -4,8 +4,8 @@
_realname=mimalloc
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=2.2.2
pkgrel=4
pkgver=2.2.4
pkgrel=1
pkgdesc='General-purpose allocator with excellent performance characteristics (mingw-w64)'
arch=('any')
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@ -15,19 +15,8 @@ depends=("${MINGW_PACKAGE_PREFIX}-cc-libs")
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-ninja")
source=("https://github.com/microsoft/${_realname}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
"0001-fix-import-lib.patch"
"0002-remove-the-lib-prefix-when-enabling-mimalloc-redirec.patch")
sha256sums=('0f9dc18b1b0b664e68dd57c537b9edc3e8c3b5e12932cff0d4277134318ee930'
'23d4e33be33e542ba891c3b6c953c115c0a59e65e4f132ce90adb15df7695a3e'
'24d056016a817d334e3edd296d589bfd989f3084635b24c7d8f01ccd3c23879c')
prepare() {
cd ${_realname}-${pkgver}
patch -Np1 -i ../0001-fix-import-lib.patch
patch -Np1 -i ../0002-remove-the-lib-prefix-when-enabling-mimalloc-redirec.patch
}
source=("https://github.com/microsoft/${_realname}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz")
sha256sums=('754a98de5e2912fddbeaf24830f982b4540992f1bab4a0a8796ee118e0752bda')
build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \