Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mimalloc: add version 1.7.9, 2.0.9 #14931

Merged
merged 6 commits into from
Jan 30, 2023

Conversation

toge
Copy link
Contributor

@toge toge commented Dec 25, 2022

Specify library name and version: mimalloc/1.7.9,2.0.9


@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

Co-authored-by: Chris Mc <prince.chrismc@gmail.com>
@conan-center-bot

This comment has been minimized.

@@ -144,6 +143,13 @@ def build(self):
replace_in_file(self, os.path.join(self.source_folder, "CMakeLists.txt"),
"mimalloc-redirect.lib",
"mimalloc-redirect32.lib")
if self.version in ["1.7.9", "2.0.9"]:
replace_in_file(self, os.path.join(self.source_folder, "include", "mimalloc.h"),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this be a patch please?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@prince-chrismc
I agree with you!
I create patches for it.

replace_in_file(self, os.path.join(self.source_folder, "include", "mimalloc.h"),
"template<class U> bool is_equal(const _mi_heap_stl_allocator_common<U, destroy>& x) const { return (this->heap == x.heap); }",
"template<class U, bool b> bool is_equal(const _mi_heap_stl_allocator_common<U, b>& x) const { return (this->heap == x.heap); }")
replace_in_file(self, os.path.join(self.source_folder, "include", "mimalloc.h"),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this be a patch please?

@conan-center-bot
Copy link
Collaborator

Conan v1 pipeline

All green in build 5 (1c550a3727539821f0f6f3796ece5eb080c6b05b):

  • mimalloc/2.0.7@:
    All packages built successfully! (All logs)

  • mimalloc/2.0.6@:
    All packages built successfully! (All logs)

  • mimalloc/2.0.5@:
    All packages built successfully! (All logs)

  • mimalloc/2.0.3@:
    All packages built successfully! (All logs)

  • mimalloc/1.6.7@:
    All packages built successfully! (All logs)

  • mimalloc/2.0.2@:
    All packages built successfully! (All logs)

  • mimalloc/1.7.5@:
    All packages built successfully! (All logs)

  • mimalloc/1.7.6@:
    All packages built successfully! (All logs)

  • mimalloc/1.7.7@:
    All packages built successfully! (All logs)

  • mimalloc/1.7.9@:
    All packages built successfully! (All logs)

  • mimalloc/2.0.9@:
    All packages built successfully! (All logs)

Copy link
Member

@uilianries uilianries left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@conan-center-bot conan-center-bot merged commit 27b3b09 into conan-io:master Jan 30, 2023
StellaSmith pushed a commit to StellaSmith/conan-center-index that referenced this pull request Feb 2, 2023
* mimalloc: add version 1.7.9, 2.0.9

* fix compilation error on msvc

* use self.settings instead self.info.settings

Co-authored-by: Chris Mc <prince.chrismc@gmail.com>

* use self.settings instead of self.info.settings

Co-authored-by: Chris Mc <prince.chrismc@gmail.com>

* create patches for older compilers

---------

Co-authored-by: Chris Mc <prince.chrismc@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants