diff --git a/recipes/mimalloc/all/conandata.yml b/recipes/mimalloc/all/conandata.yml index 4c93c0b6b2850..879d39b04284b 100644 --- a/recipes/mimalloc/all/conandata.yml +++ b/recipes/mimalloc/all/conandata.yml @@ -1,44 +1,30 @@ sources: + "2.1.7": + url: "https://github.com/microsoft/mimalloc/archive/v2.1.7.tar.gz" + sha256: "0eed39319f139afde8515010ff59baf24de9e47ea316a315398e8027d198202d" "2.1.2": url: "https://github.com/microsoft/mimalloc/archive/v2.1.2.tar.gz" sha256: "2b1bff6f717f9725c70bf8d79e4786da13de8a270059e4ba0bdd262ae7be46eb" "2.0.9": url: "https://github.com/microsoft/mimalloc/archive/v2.0.9.tar.gz" sha256: "4a29edae32a914a706715e2ac8e7e4109e25353212edeed0888f4e3e15db5850" - "2.0.7": - url: "https://github.com/microsoft/mimalloc/archive/v2.0.7.tar.gz" - sha256: "f23aac6c73594e417af50cb38f1efed88ef1dc14a490f0eff07c7f7b079810a4" - "2.0.6": - url: "https://github.com/microsoft/mimalloc/archive/v2.0.6.tar.gz" - sha256: "9f05c94cc2b017ed13698834ac2a3567b6339a8bde27640df5a1581d49d05ce5" - "2.0.5": - url: "https://github.com/microsoft/mimalloc/archive/v2.0.5.tar.gz" - sha256: "fb000a017c289ddc0df749f16fef854e033e496276d8426bdd066b59c476f6cf" - "2.0.3": - url: "https://github.com/microsoft/mimalloc/archive/v2.0.3.tar.gz" - sha256: "5af497f360879bf9d07a5146961d275a25f4177fbe21ee6c437db604422acd60" - "2.0.2": - url: "https://github.com/microsoft/mimalloc/archive/v2.0.2.tar.gz" - sha256: "c81a5f443f72373e3105172d6a935e29b0dabd13ba387c080bc444586cbe3021" + "1.8.7": + url: "https://github.com/microsoft/mimalloc/archive/v1.8.7.tar.gz" + sha256: "347793a2c614e525edc4e286ab5cbc4c7a5efc12503e2dafca276d78394c4f07" "1.8.2": url: "https://github.com/microsoft/mimalloc/archive/v1.8.2.tar.gz" sha256: "4058d53d6ceb75862f32c30a6ee686c3cbb5e965b2c324b828ca454f7fe064f9" "1.7.9": url: "https://github.com/microsoft/mimalloc/archive/v1.7.9.tar.gz" sha256: "45e05be518363d32b2cdcce1a1fac3580895ea2e4524e1a3c7e71145cb58659f" - "1.7.7": - url: "https://github.com/microsoft/mimalloc/archive/v1.7.7.tar.gz" - sha256: "0f6663be1e1764851bf9563fcf7a6b3330e23b933eb4737dd07e3289b87895fe" "1.7.6": url: "https://github.com/microsoft/mimalloc/archive/v1.7.6.tar.gz" sha256: "d74f86ada2329016068bc5a243268f1f555edd620b6a7d6ce89295e7d6cf18da" - "1.7.5": - url: "https://github.com/microsoft/mimalloc/archive/v1.7.5.tar.gz" - sha256: "4f9ed087fc1804a8a77c4225ffc3337468f18d6c4f060c4d44f3a3eff85bc5b6" - "1.6.7": - url: "https://github.com/microsoft/mimalloc/archive/v1.6.7.tar.gz" - sha256: "111b718b496f297f128d842880e72e90e33953cf00b45ba0ccd2167e7340ed17" patches: + "2.1.7": + - patch_file: "patches/2.1.7-0002-support-older-compiler.patch" + patch_description: "fix compilation errors on older compilers" + patch_type: "portability" "2.1.2": - patch_file: "patches/2.1.2-0001-change-install-paths.patch" patch_description: "fix install paths" @@ -53,28 +39,9 @@ patches: - patch_file: "patches/2.0.9-0002-support-older-compiler.patch" patch_description: "fix compilation errors on older compilers" patch_type: "portability" - "2.0.7": - - patch_file: "patches/2.0.7-0001-change-install-paths.patch" - patch_description: "fix install paths" - patch_type: "conan" - "2.0.6": - - patch_file: "patches/2.0.6-0001-change-install-paths.patch" - patch_description: "fix install paths" - patch_type: "conan" - "2.0.5": - - patch_file: "patches/2.0.6-0001-change-install-paths.patch" - patch_description: "fix install paths" - patch_type: "conan" - "2.0.3": - - patch_file: "patches/2.0.3-0001-change-install-paths-avoid-symlink.patch" - patch_description: "fix install paths, disable creating symlink" - patch_type: "conan" - "2.0.2": - - patch_file: "patches/2.0.2-0001-change-install-paths-avoid-symlink.patch" - patch_description: "fix install paths, disable creating symlink" - patch_type: "conan" - - patch_file: "patches/2.0.2-0002-include-cstddef-to-get-std-size-t.patch" - patch_description: "include stddef" + "1.8.7": + - patch_file: "patches/1.8.7-0002-support-older-compiler.patch" + patch_description: "fix compilation errors on older compilers" patch_type: "portability" "1.8.2": - patch_file: "patches/1.8.2-0001-change-install-paths.patch" @@ -90,22 +57,7 @@ patches: - patch_file: "patches/1.7.9-0002-support-older-compiler.patch" patch_description: "fix compilation errors on older compilers" patch_type: "portability" - "1.7.7": - - patch_file: "patches/1.7.7-0001-change-install-paths.patch" - patch_description: "fix install paths" - patch_type: "conan" "1.7.6": - patch_file: "patches/1.7.5-0001-change-install-paths.patch" patch_description: "fix install paths" patch_type: "conan" - "1.7.5": - - patch_file: "patches/1.7.5-0001-change-install-paths.patch" - patch_description: "fix install paths" - patch_type: "conan" - "1.6.7": - - patch_file: "patches/1.6.7-0001-change-install-paths-avoid-symlink.patch" - patch_description: "fix install paths, disable creating symlink" - patch_type: "conan" - - patch_file: "patches/1.6.7-0002-include-cstddef-to-get-std-size-t.patch" - patch_description: "include stddef" - patch_type: "portability" diff --git a/recipes/mimalloc/all/conanfile.py b/recipes/mimalloc/all/conanfile.py index eaa8e6193ea4e..881542551c915 100644 --- a/recipes/mimalloc/all/conanfile.py +++ b/recipes/mimalloc/all/conanfile.py @@ -4,6 +4,7 @@ from conan.tools.files import apply_conandata_patches, export_conandata_patches, get, copy, rm, rmdir, replace_in_file, save, collect_libs from conan.tools.microsoft import is_msvc, is_msvc_static_runtime, VCVars from conan.tools.scm import Version +from conan.tools.env import VirtualBuildEnv import os import shutil import textwrap @@ -13,10 +14,10 @@ class MimallocConan(ConanFile): name = "mimalloc" + description = "mimalloc is a compact general purpose allocator with excellent performance." license = "MIT" url = "https://github.com/conan-io/conan-center-index" homepage = "https://github.com/microsoft/mimalloc" - description = "mimalloc is a compact general purpose allocator with excellent performance." topics = ("mimalloc", "allocator", "performance", "microsoft") package_type = "library" settings = "os", "arch", "compiler", "build_type" @@ -94,6 +95,9 @@ def validate(self): self.options.get_safe("inject"): raise ConanInvalidConfiguration("Single object is incompatible with library injection") + def build_requirements(self): + self.tool_requires("cmake/[>=3.18 <4]") + def source(self): get(self, **self.conan_data["sources"][self.version], strip_root=True) @@ -105,9 +109,12 @@ def generate(self): tc.variables["MI_BUILD_OBJECT"] = self.options.get_safe("single_object", False) tc.variables["MI_OVERRIDE"] = "ON" if self.options.override else "OFF" tc.variables["MI_SECURE"] = "ON" if self.options.secure else "OFF" + tc.variables["MI_WIN_REDIRECT"] = "OFF" if Version(self.version) >= "1.7.0": tc.variables["MI_INSTALL_TOPLEVEL"] = "ON" tc.generate() + venv = VirtualBuildEnv(self) + venv.generate(scope="build") if is_msvc(self): vcvars = VCVars(self) diff --git a/recipes/mimalloc/all/patches/1.6.7-0001-change-install-paths-avoid-symlink.patch b/recipes/mimalloc/all/patches/1.6.7-0001-change-install-paths-avoid-symlink.patch deleted file mode 100644 index 6fa2c822d32ef..0000000000000 --- a/recipes/mimalloc/all/patches/1.6.7-0001-change-install-paths-avoid-symlink.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 35460e8..e5340d5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -206,7 +206,7 @@ endif() - # Install and output names - # ----------------------------------------------------------------------------- - --set(mi_install_dir "${CMAKE_INSTALL_PREFIX}/lib/mimalloc-${mi_version}") -+set(mi_install_dir ".") - if(MI_SECURE MATCHES "ON") - set(mi_basename "mimalloc-secure") - else() -@@ -263,7 +263,7 @@ if(MI_BUILD_SHARED) - COMMENT "Copy mimalloc-redirect.dll to output directory") - endif() - -- install(TARGETS mimalloc EXPORT mimalloc DESTINATION ${mi_install_dir} LIBRARY) -+ install(TARGETS mimalloc EXPORT mimalloc RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) - install(EXPORT mimalloc DESTINATION ${mi_install_dir}/cmake) - endif() - -@@ -287,7 +287,7 @@ 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 RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) - endif() - - # install include files -@@ -297,7 +297,7 @@ install(FILES include/mimalloc-new-delete.h DESTINATION ${mi_install_dir}/includ - install(FILES cmake/mimalloc-config.cmake DESTINATION ${mi_install_dir}/cmake) - install(FILES cmake/mimalloc-config-version.cmake DESTINATION ${mi_install_dir}/cmake) - --if(NOT WIN32 AND MI_BUILD_SHARED) -+if(FALSE) - # install a symlink in the /usr/local/lib to the versioned library - set(mi_symlink "${CMAKE_SHARED_MODULE_PREFIX}${mi_basename}${CMAKE_SHARED_LIBRARY_SUFFIX}") - set(mi_soname "mimalloc-${mi_version}/${mi_symlink}.${mi_version}") diff --git a/recipes/mimalloc/all/patches/1.6.7-0002-include-cstddef-to-get-std-size-t.patch b/recipes/mimalloc/all/patches/1.6.7-0002-include-cstddef-to-get-std-size-t.patch deleted file mode 100644 index b6a13ceb0fb42..0000000000000 --- a/recipes/mimalloc/all/patches/1.6.7-0002-include-cstddef-to-get-std-size-t.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/include/mimalloc.h b/include/mimalloc.h -index 254a7d9..3c3142b 100644 ---- a/include/mimalloc.h -+++ b/include/mimalloc.h -@@ -377,6 +377,7 @@ mi_decl_nodiscard mi_decl_export void* mi_new_reallocn(void* p, size_t newcount, - #ifdef __cplusplus - - #include // PTRDIFF_MAX -+#include // std::size_t - #if (__cplusplus >= 201103L) || (_MSC_VER > 1900) // C++11 - #include // std::true_type - #include // std::forward diff --git a/recipes/mimalloc/all/patches/1.7.7-0001-change-install-paths.patch b/recipes/mimalloc/all/patches/1.7.7-0001-change-install-paths.patch deleted file mode 100644 index 108558a1f1922..0000000000000 --- a/recipes/mimalloc/all/patches/1.7.7-0001-change-install-paths.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2bc0f76..f40e272 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -360,7 +360,7 @@ if(MI_BUILD_SHARED) - install(FILES "$/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" DESTINATION ${mi_install_libdir}) - endif() - -- install(TARGETS mimalloc EXPORT mimalloc DESTINATION ${mi_install_libdir} LIBRARY) -+ install(TARGETS mimalloc EXPORT mimalloc RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) - install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir}) - endif() - -@@ -384,7 +384,7 @@ if (MI_BUILD_STATIC) - set_target_properties(mimalloc-static PROPERTIES OUTPUT_NAME ${mi_basename}) - endif() - -- install(TARGETS mimalloc-static EXPORT mimalloc DESTINATION ${mi_install_objdir} LIBRARY) -+ install(TARGETS mimalloc-static EXPORT mimalloc RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) - install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir}) - endif() - diff --git a/recipes/mimalloc/all/patches/1.8.7-0002-support-older-compiler.patch b/recipes/mimalloc/all/patches/1.8.7-0002-support-older-compiler.patch new file mode 100644 index 0000000000000..4b1890b784ff9 --- /dev/null +++ b/recipes/mimalloc/all/patches/1.8.7-0002-support-older-compiler.patch @@ -0,0 +1,22 @@ +diff --git a/include/mimalloc.h b/include/mimalloc.h +index ae6f99b..773424e 100644 +--- a/include/mimalloc.h ++++ b/include/mimalloc.h +@@ -511,7 +511,7 @@ template struct _mi_heap_stl_allocator_common : publi + #endif + + void collect(bool force) { mi_heap_collect(this->heap.get(), force); } +- template bool is_equal(const _mi_heap_stl_allocator_common& x) const { return (this->heap == x.heap); } ++ template bool is_equal(const _mi_heap_stl_allocator_common& x) const { return (this->heap == x.heap); } + + protected: + std::shared_ptr heap; +@@ -522,7 +522,7 @@ protected: + this->heap.reset(hp, (_mi_destroy ? &heap_destroy : &heap_delete)); /* calls heap_delete/destroy when the refcount drops to zero */ + } + _mi_heap_stl_allocator_common(const _mi_heap_stl_allocator_common& x) mi_attr_noexcept : heap(x.heap) { } +- template _mi_heap_stl_allocator_common(const _mi_heap_stl_allocator_common& x) mi_attr_noexcept : heap(x.heap) { } ++ template _mi_heap_stl_allocator_common(const _mi_heap_stl_allocator_common& x) mi_attr_noexcept : heap(x.heap) { } + + private: + static void heap_delete(mi_heap_t* hp) { if (hp != NULL) { mi_heap_delete(hp); } } diff --git a/recipes/mimalloc/all/patches/2.0.2-0001-change-install-paths-avoid-symlink.patch b/recipes/mimalloc/all/patches/2.0.2-0001-change-install-paths-avoid-symlink.patch deleted file mode 100644 index ffbc799da2d8e..0000000000000 --- a/recipes/mimalloc/all/patches/2.0.2-0001-change-install-paths-avoid-symlink.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2021-06-18 00:05:40.000000000 -0300 -+++ b/CMakeLists.txt 2021-07-14 18:02:10.941935678 -0300 -@@ -281,7 +281,7 @@ - COMMENT "Copy mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll to output directory") - endif() - -- install(TARGETS mimalloc EXPORT mimalloc DESTINATION ${mi_install_libdir} LIBRARY) -+ install(TARGETS mimalloc EXPORT mimalloc RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) - install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir}) - endif() - -@@ -305,7 +305,7 @@ - set_target_properties(mimalloc-static PROPERTIES OUTPUT_NAME ${mi_basename}) - endif() - -- install(TARGETS mimalloc-static EXPORT mimalloc DESTINATION ${mi_install_libdir} LIBRARY) -+ install(TARGETS mimalloc-static EXPORT mimalloc RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) - endif() - - # install include files -@@ -315,7 +315,7 @@ - install(FILES cmake/mimalloc-config.cmake DESTINATION ${mi_install_cmakedir}) - install(FILES cmake/mimalloc-config-version.cmake DESTINATION ${mi_install_cmakedir}) - --if(NOT WIN32 AND MI_BUILD_SHARED AND NOT MI_INSTALL_TOPLEVEL) -+if(FALSE) - # install a symlink in the /usr/local/lib to the versioned library - # note: use delayed prefix expansion as \${CMAKE_INSTALL_PREFIX} - set(mi_symlink "${CMAKE_SHARED_MODULE_PREFIX}${mi_basename}${CMAKE_SHARED_LIBRARY_SUFFIX}") diff --git a/recipes/mimalloc/all/patches/2.0.2-0002-include-cstddef-to-get-std-size-t.patch b/recipes/mimalloc/all/patches/2.0.2-0002-include-cstddef-to-get-std-size-t.patch deleted file mode 100644 index fc8068130bf11..0000000000000 --- a/recipes/mimalloc/all/patches/2.0.2-0002-include-cstddef-to-get-std-size-t.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/include/mimalloc.h b/include/mimalloc.h -index 254a7d9..3c3142b 100644 ---- a/include/mimalloc.h -+++ b/include/mimalloc.h -@@ -387,6 +387,7 @@ mi_decl_nodiscard mi_decl_export void* mi_new_reallocn(void* p, size_t newcount, - #ifdef __cplusplus - - #include // PTRDIFF_MAX -+#include // std::size_t - #if (__cplusplus >= 201103L) || (_MSC_VER > 1900) // C++11 - #include // std::true_type - #include // std::forward diff --git a/recipes/mimalloc/all/patches/2.0.3-0001-change-install-paths-avoid-symlink.patch b/recipes/mimalloc/all/patches/2.0.3-0001-change-install-paths-avoid-symlink.patch deleted file mode 100644 index 00b059ccae3db..0000000000000 --- a/recipes/mimalloc/all/patches/2.0.3-0001-change-install-paths-avoid-symlink.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 580e38c..19fce47 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -305,7 +305,7 @@ if(MI_BUILD_SHARED) - COMMENT "Copy mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll to output directory") - endif() - -- install(TARGETS mimalloc EXPORT mimalloc DESTINATION ${mi_install_libdir} LIBRARY) -+ install(TARGETS mimalloc EXPORT mimalloc RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) - install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir}) - endif() - -@@ -329,7 +329,7 @@ if (MI_BUILD_STATIC) - set_target_properties(mimalloc-static PROPERTIES OUTPUT_NAME ${mi_basename}) - endif() - -- install(TARGETS mimalloc-static EXPORT mimalloc DESTINATION ${mi_install_libdir} LIBRARY) -+ install(TARGETS mimalloc-static EXPORT mimalloc RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) - endif() - - # install include files -@@ -339,7 +339,7 @@ install(FILES include/mimalloc-new-delete.h DESTINATION ${mi_install_incdir}) - install(FILES cmake/mimalloc-config.cmake DESTINATION ${mi_install_cmakedir}) - install(FILES cmake/mimalloc-config-version.cmake DESTINATION ${mi_install_cmakedir}) - --if(NOT WIN32 AND MI_BUILD_SHARED AND NOT MI_INSTALL_TOPLEVEL) -+if(FALSE) - # install a symlink in the /usr/local/lib to the versioned library - # note: use delayed prefix expansion as \${CMAKE_INSTALL_PREFIX} - set(mi_symlink "${CMAKE_SHARED_MODULE_PREFIX}${mi_basename}${CMAKE_SHARED_LIBRARY_SUFFIX}") diff --git a/recipes/mimalloc/all/patches/2.0.6-0001-change-install-paths.patch b/recipes/mimalloc/all/patches/2.0.6-0001-change-install-paths.patch deleted file mode 100644 index bb266a46ce3f6..0000000000000 --- a/recipes/mimalloc/all/patches/2.0.6-0001-change-install-paths.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8127e09..af459af 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -319,7 +319,7 @@ if(MI_BUILD_SHARED) - install(FILES "$/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" DESTINATION ${mi_install_libdir}) - endif() - -- install(TARGETS mimalloc EXPORT mimalloc DESTINATION ${mi_install_libdir} LIBRARY) -+ install(TARGETS mimalloc EXPORT mimalloc RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) - install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir}) - endif() - -@@ -343,7 +343,7 @@ if (MI_BUILD_STATIC) - set_target_properties(mimalloc-static PROPERTIES OUTPUT_NAME ${mi_basename}) - endif() - -- install(TARGETS mimalloc-static EXPORT mimalloc DESTINATION ${mi_install_objdir} LIBRARY) -+ install(TARGETS mimalloc-static EXPORT mimalloc RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) - install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir}) - endif() - diff --git a/recipes/mimalloc/all/patches/2.0.7-0001-change-install-paths.patch b/recipes/mimalloc/all/patches/2.0.7-0001-change-install-paths.patch deleted file mode 100644 index adf1e00f9607c..0000000000000 --- a/recipes/mimalloc/all/patches/2.0.7-0001-change-install-paths.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2550f0d..da42112 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -360,7 +360,7 @@ if(MI_BUILD_SHARED) - install(FILES "$/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" DESTINATION ${mi_install_libdir}) - endif() - -- install(TARGETS mimalloc EXPORT mimalloc DESTINATION ${mi_install_libdir} LIBRARY) -+ install(TARGETS mimalloc EXPORT mimalloc RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) - install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir}) - endif() - -@@ -384,7 +384,7 @@ if (MI_BUILD_STATIC) - set_target_properties(mimalloc-static PROPERTIES OUTPUT_NAME ${mi_basename}) - endif() - -- install(TARGETS mimalloc-static EXPORT mimalloc DESTINATION ${mi_install_objdir} LIBRARY) -+ install(TARGETS mimalloc-static EXPORT mimalloc RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) - install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir}) - endif() - diff --git a/recipes/mimalloc/all/patches/2.1.7-0002-support-older-compiler.patch b/recipes/mimalloc/all/patches/2.1.7-0002-support-older-compiler.patch new file mode 100644 index 0000000000000..34149f1737e9e --- /dev/null +++ b/recipes/mimalloc/all/patches/2.1.7-0002-support-older-compiler.patch @@ -0,0 +1,22 @@ +diff --git a/include/mimalloc.h b/include/mimalloc.h +index c41bcc8..cc4929e 100644 +--- a/include/mimalloc.h ++++ b/include/mimalloc.h +@@ -512,7 +512,7 @@ template struct _mi_heap_stl_allocator_common : publi + #endif + + void collect(bool force) { mi_heap_collect(this->heap.get(), force); } +- template bool is_equal(const _mi_heap_stl_allocator_common& x) const { return (this->heap == x.heap); } ++ template bool is_equal(const _mi_heap_stl_allocator_common& x) const { return (this->heap == x.heap); } + + protected: + std::shared_ptr heap; +@@ -523,7 +523,7 @@ protected: + this->heap.reset(hp, (_mi_destroy ? &heap_destroy : &heap_delete)); /* calls heap_delete/destroy when the refcount drops to zero */ + } + _mi_heap_stl_allocator_common(const _mi_heap_stl_allocator_common& x) mi_attr_noexcept : heap(x.heap) { } +- template _mi_heap_stl_allocator_common(const _mi_heap_stl_allocator_common& x) mi_attr_noexcept : heap(x.heap) { } ++ template _mi_heap_stl_allocator_common(const _mi_heap_stl_allocator_common& x) mi_attr_noexcept : heap(x.heap) { } + + private: + static void heap_delete(mi_heap_t* hp) { if (hp != NULL) { mi_heap_delete(hp); } } diff --git a/recipes/mimalloc/config.yml b/recipes/mimalloc/config.yml index 2f9902ecefeb6..8b0873bb9cd4c 100644 --- a/recipes/mimalloc/config.yml +++ b/recipes/mimalloc/config.yml @@ -1,27 +1,17 @@ versions: + "2.1.7": + folder: all + # mold requires 2.1.2 "2.1.2": folder: all "2.0.9": folder: all - "2.0.7": - folder: all - "2.0.6": - folder: all - "2.0.5": - folder: all - "2.0.3": - folder: all - "2.0.2": + "1.8.7": folder: all "1.8.2": folder: all "1.7.9": folder: all - "1.7.7": - folder: all + # arrow requires 1.7.6 "1.7.6": folder: all - "1.7.5": - folder: all - "1.6.7": - folder: all