From c4a6704a5d7a024fac853d8dcc03f9945f9db5c5 Mon Sep 17 00:00:00 2001 From: toge Date: Fri, 1 May 2026 19:41:27 +0900 Subject: [PATCH] [mimalloc] update to 3.3.2 (#51481) --- ports/mimalloc/portfile.cmake | 134 +++++++++++++++++----------------- ports/mimalloc/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mimalloc.json | 5 ++ 4 files changed, 74 insertions(+), 69 deletions(-) diff --git a/ports/mimalloc/portfile.cmake b/ports/mimalloc/portfile.cmake index 6c15866c6d..1b56310cba 100644 --- a/ports/mimalloc/portfile.cmake +++ b/ports/mimalloc/portfile.cmake @@ -1,67 +1,67 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO microsoft/mimalloc - REF "v${VERSION}" - SHA512 c829e402ad9b8784cb30c6d42186627e779936d90c952474785e0da77a31699e8532f64d8a0e68d4559c759a0c1c6910391ba4423191bfbc8a92876b95abe8a7 - HEAD_REF dev3 - PATCHES - pkgconfig-cxx.diff -) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - override MI_OVERRIDE - secure MI_SECURE -) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" MI_BUILD_STATIC) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" MI_BUILD_SHARED) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - ${FEATURE_OPTIONS} - -DMI_USE_CXX=ON - -DMI_BUILD_OBJECT=OFF - -DMI_BUILD_TESTS=OFF - -DMI_BUILD_STATIC=${MI_BUILD_STATIC} - -DMI_BUILD_SHARED=${MI_BUILD_SHARED} - -DMI_INSTALL_TOPLEVEL=ON - OPTIONS_DEBUG - -DMI_DEBUG_FULL=ON - OPTIONS_RELEASE - -DMI_DEBUG_FULL=OFF -) - -vcpkg_cmake_install() - -vcpkg_copy_pdbs() - -file(COPY - "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" - "${CMAKE_CURRENT_LIST_DIR}/usage" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" -) -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mimalloc) - -if(VCPKG_TARGET_IS_WINDOWS) - file(INSTALL - "${SOURCE_PATH}/bin/minject.exe" - "${SOURCE_PATH}/bin/minject32.exe" - "${SOURCE_PATH}/bin/minject-arm64.exe" - DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/" - ) -endif() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - vcpkg_replace_string( - "${CURRENT_PACKAGES_DIR}/include/mimalloc.h" - "!defined(MI_SHARED_LIB)" - "0 // !defined(MI_SHARED_LIB)" - ) -endif() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -vcpkg_fixup_pkgconfig() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/mimalloc + REF "v${VERSION}" + SHA512 226bbd51eca36d7737ce5e2edba7e0a3beeca448462a861bcbfb6726a0994bc077b4c684d7ff8b0805d71bf770e00df14f10ed598256ee54a154d8cc08e6a5c1 + HEAD_REF dev3 + PATCHES + pkgconfig-cxx.diff +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + override MI_OVERRIDE + secure MI_SECURE +) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" MI_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" MI_BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DMI_USE_CXX=ON + -DMI_BUILD_OBJECT=OFF + -DMI_BUILD_TESTS=OFF + -DMI_BUILD_STATIC=${MI_BUILD_STATIC} + -DMI_BUILD_SHARED=${MI_BUILD_SHARED} + -DMI_INSTALL_TOPLEVEL=ON + OPTIONS_DEBUG + -DMI_DEBUG_FULL=ON + OPTIONS_RELEASE + -DMI_DEBUG_FULL=OFF +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +file(COPY + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" + "${CMAKE_CURRENT_LIST_DIR}/usage" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" +) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mimalloc) + +if(VCPKG_TARGET_IS_WINDOWS) + file(INSTALL + "${SOURCE_PATH}/bin/minject.exe" + "${SOURCE_PATH}/bin/minject32.exe" + "${SOURCE_PATH}/bin/minject-arm64.exe" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/" + ) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/include/mimalloc.h" + "!defined(MI_SHARED_LIB)" + "0 // !defined(MI_SHARED_LIB)" + ) +endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/mimalloc/vcpkg.json b/ports/mimalloc/vcpkg.json index 19aa2103d4..b322830c48 100644 --- a/ports/mimalloc/vcpkg.json +++ b/ports/mimalloc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mimalloc", - "version": "3.3.1", + "version": "3.3.2", "description": "Compact general purpose allocator with excellent performance", "homepage": "https://github.com/microsoft/mimalloc", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 437ad96656..cd2cdcc375 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6493,7 +6493,7 @@ "port-version": 3 }, "mimalloc": { - "baseline": "3.3.1", + "baseline": "3.3.2", "port-version": 0 }, "mimicpp": { diff --git a/versions/m-/mimalloc.json b/versions/m-/mimalloc.json index 674adba668..a06f071725 100644 --- a/versions/m-/mimalloc.json +++ b/versions/m-/mimalloc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "221874f896b6c2053df9ba30ec874d8fe692c77a", + "version": "3.3.2", + "port-version": 0 + }, { "git-tree": "0b2abb3f0c610f3cb3174c8196b15ec11c9b0cf0", "version": "3.3.1",