From 1095c177a9e1616921c03ffcd3a7799c627b5cd0 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 23 Sep 2020 07:38:03 +0800 Subject: [mimalloc] Update to 1.6.4 (#13629) * [mimalloc] Update to 1.6.4 * deletecibaseline --- ports/mimalloc/CONTROL | 3 +- ports/mimalloc/fix-cmake.patch | 81 ++++++++++++++++++------------------------ ports/mimalloc/portfile.cmake | 9 +++-- scripts/ci.baseline.txt | 3 -- 4 files changed, 43 insertions(+), 53 deletions(-) diff --git a/ports/mimalloc/CONTROL b/ports/mimalloc/CONTROL index 95fec2b75..90cb64d93 100644 --- a/ports/mimalloc/CONTROL +++ b/ports/mimalloc/CONTROL @@ -1,7 +1,8 @@ Source: mimalloc -Version: 1.6.1-1 +Version: 1.6.4 Description: Compact general purpose allocator with excellent performance Homepage: https://github.com/microsoft/mimalloc +Supports: !(arm|uwp) Feature: asm Description: Generate assembly files diff --git a/ports/mimalloc/fix-cmake.patch b/ports/mimalloc/fix-cmake.patch index d751a21c4..42d74f8c2 100644 --- a/ports/mimalloc/fix-cmake.patch +++ b/ports/mimalloc/fix-cmake.patch @@ -1,26 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index e16830a..3c7c8da 100644 +index 37616eb..4c81e6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -166,6 +166,7 @@ message(STATUS "") - # Main targets - # ----------------------------------------------------------------------------- - -+if(BUILD_SHARED_LIBS) - # shared library - add_library(mimalloc SHARED ${mi_sources}) - set_target_properties(mimalloc PROPERTIES VERSION ${mi_version} OUTPUT_NAME ${mi_basename} ) -@@ -178,12 +179,27 @@ target_include_directories(mimalloc PUBLIC - ) - if(WIN32) - # On windows copy the mimalloc redirection dll too. -- target_link_libraries(mimalloc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect.lib) -- add_custom_command(TARGET mimalloc POST_BUILD -+ if(CMAKE_SIZEOF_VOID_P EQUAL 8) -+ target_link_libraries(mimalloc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect.lib) -+ add_custom_command(TARGET mimalloc POST_BUILD - COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect.dll" $ - COMMENT "Copy mimalloc-redirect.dll to output directory") +@@ -251,14 +251,28 @@ if(MI_BUILD_SHARED) + ) + if(WIN32) + # On windows copy the mimalloc redirection dll too. ++ if(CMAKE_SIZEOF_VOID_P EQUAL 8) + target_link_libraries(mimalloc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect.lib) + add_custom_command(TARGET mimalloc POST_BUILD + COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect.dll" $ + COMMENT "Copy mimalloc-redirect.dll to output directory") +- endif() + install ( + FILES $/mimalloc-redirect.dll + DESTINATION ${CMAKE_INSTALL_BINDIR} @@ -34,37 +25,35 @@ index e16830a..3c7c8da 100644 + FILES $/mimalloc-redirect32.dll + DESTINATION ${CMAKE_INSTALL_BINDIR} + ) -+ endif() ++ endif() ++endif() + +- install(TARGETS mimalloc EXPORT mimalloc DESTINATION ${mi_install_dir} LIBRARY) +- install(EXPORT mimalloc DESTINATION ${mi_install_dir}/cmake) ++ install(TARGETS mimalloc EXPORT mimalloc ARCHIVE DESTINATION lib RUNTIME DESTINATION bin LIBRARY DESTINATION lib NAMELINK_SKIP) endif() -- -+else() + # static library - add_library(mimalloc-static STATIC ${mi_sources}) - target_compile_definitions(mimalloc-static PRIVATE ${mi_defines} MI_STATIC_LIB) -@@ -201,10 +217,13 @@ if(WIN32) - else() - set_target_properties(mimalloc-static PROPERTIES OUTPUT_NAME ${mi_basename}) +@@ -281,9 +295,11 @@ if (MI_BUILD_STATIC) + set_target_properties(mimalloc-static PROPERTIES OUTPUT_NAME ${mi_basename}) + endif() + +- install(TARGETS mimalloc-static EXPORT mimalloc DESTINATION ${mi_install_dir}) ++ install(TARGETS mimalloc-static EXPORT mimalloc DESTINATION lib) endif() -- -+endif() - # install static and shared library, and the include files --install(TARGETS mimalloc EXPORT mimalloc DESTINATION ${mi_install_dir} LIBRARY) --install(TARGETS mimalloc-static EXPORT mimalloc DESTINATION ${mi_install_dir}) -+if(BUILD_SHARED_LIBS) -+install(TARGETS mimalloc EXPORT mimalloc ARCHIVE DESTINATION lib RUNTIME DESTINATION bin LIBRARY DESTINATION lib NAMELINK_SKIP) -+else() -+install(TARGETS mimalloc-static EXPORT mimalloc DESTINATION lib) -+endif() + ++install(EXPORT mimalloc DESTINATION ${mi_install_dir}/cmake) ++ + # install include files install(FILES include/mimalloc.h DESTINATION ${mi_install_dir}/include) install(FILES include/mimalloc-override.h DESTINATION ${mi_install_dir}/include) - install(FILES include/mimalloc-new-delete.h DESTINATION ${mi_install_dir}/include) -@@ -234,9 +253,6 @@ target_include_directories(mimalloc-obj PUBLIC +@@ -315,9 +331,6 @@ if (MI_BUILD_OBJECT) - # the FILES expression can also be: $ - # but that fails cmake versions less than 3.10 so we leave it as is for now --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/mimalloc-obj.dir/src/static.c${CMAKE_C_OUTPUT_EXTENSION} -- DESTINATION ${mi_install_dir} -- RENAME ${mi_basename}${CMAKE_C_OUTPUT_EXTENSION} ) + # the FILES expression can also be: $ + # but that fails cmake versions less than 3.10 so we leave it as is for now +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/mimalloc-obj.dir/src/static.c${CMAKE_C_OUTPUT_EXTENSION} +- DESTINATION ${mi_install_dir} +- RENAME ${mi_basename}${CMAKE_C_OUTPUT_EXTENSION} ) + endif() # ----------------------------------------------------------------------------- - # API surface testing diff --git a/ports/mimalloc/portfile.cmake b/ports/mimalloc/portfile.cmake index e22aa4619..154fa3c2a 100644 --- a/ports/mimalloc/portfile.cmake +++ b/ports/mimalloc/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/mimalloc - REF 82684042be1be44d34caecc915fb51755278d843 # v1.6.1 - SHA512 82477501a5fafa4df22c911039b74943275d0932404526692419b5c49d6ccfdd95c1c5a3689211db5cc2a845af039fda4892262b538ac7cdfb5bb35787dd355c + REF a9686d6ecf00e4467e772f7c0b4ef76a15f325f6 # v1.6.4 + SHA512 a1bda1b31d1bb3a4680fec91f180a988cf5ff486dcb8848fefd9245907f7986e4c4f10ce33133a3d796a7409ba38328bd156c47eba4f19368a2226a43b1ad298 HEAD_REF master PATCHES fix-cmake.patch @@ -15,7 +15,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS secure MI_SECURE override MI_OVERRIDE ) - +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" MI_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" MI_BUILD_SHARED) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -28,6 +29,8 @@ vcpkg_configure_cmake( -DMI_USE_CXX=OFF -DMI_BUILD_TESTS=OFF ${FEATURE_OPTIONS} + -DMI_BUILD_STATIC=${MI_BUILD_STATIC} + -DMI_BUILD_SHARED=${MI_BUILD_SHARED} ) vcpkg_install_cmake() diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index c0ea44810..114b12d46 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -990,9 +990,6 @@ mhook:x64-osx=fail mhook:x64-uwp=fail milerius-sfml-imgui:x64-osx=fail milerius-sfml-imgui:x64-windows-static=fail -mimalloc:arm64-windows=fail -mimalloc:arm-uwp=fail -mimalloc:x64-uwp=fail minhook:arm64-windows=fail minhook:arm-uwp=fail minhook:x64-linux=fail -- cgit v1.2.3