From 17a0ffda9e5a9cb21b30ca1c39e7ec07f459a3d3 Mon Sep 17 00:00:00 2001 From: toge Date: Thu, 8 Aug 2024 02:22:22 +0900 Subject: [PATCH 1/3] mold: add version 2.33.0 --- recipes/mold/all/conandata.yml | 3 +++ recipes/mold/all/conanfile.py | 2 +- recipes/mold/config.yml | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes/mold/all/conandata.yml b/recipes/mold/all/conandata.yml index 76bdbbd4a2351..2c5f346939e24 100644 --- a/recipes/mold/all/conandata.yml +++ b/recipes/mold/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "2.33.0": + url: "https://github.com/rui314/mold/archive/refs/tags/v2.33.0.tar.gz" + sha256: "37b3aacbd9b6accf581b92ba1a98ca418672ae330b78fe56ae542c2dcb10a155" "2.32.1": url: "https://github.com/rui314/mold/archive/refs/tags/v2.32.1.tar.gz" sha256: "f3c9a527d884c635834fe7d79b3de959b00783bf9446280ea274d996f0335825" diff --git a/recipes/mold/all/conanfile.py b/recipes/mold/all/conanfile.py index 68b6db435177a..f521e3e8c51e0 100644 --- a/recipes/mold/all/conanfile.py +++ b/recipes/mold/all/conanfile.py @@ -45,7 +45,7 @@ def requirements(self): self.requires("mimalloc/2.1.2") if Version(self.version) < "2.2.0": # Newer versions use vendored-in BLAKE3 - self.requires("openssl/[>=1.1 <4]") + self.requires("openssl/[>=1.1 <4]") def package_id(self): del self.info.settings.compiler diff --git a/recipes/mold/config.yml b/recipes/mold/config.yml index 096044e3278b2..e7c236baf0d22 100644 --- a/recipes/mold/config.yml +++ b/recipes/mold/config.yml @@ -1,4 +1,6 @@ versions: + "2.33.0": + folder: all "2.32.1": folder: all "2.32.0": From 5c20cdc97b58fe2fe35ca64e0ee0f922c096bcc1 Mon Sep 17 00:00:00 2001 From: toge Date: Mon, 12 Aug 2024 15:19:22 +0900 Subject: [PATCH 2/3] drop support apple-clang < 14 --- recipes/mold/all/conanfile.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/mold/all/conanfile.py b/recipes/mold/all/conanfile.py index f521e3e8c51e0..cbd0b8b57ce98 100644 --- a/recipes/mold/all/conanfile.py +++ b/recipes/mold/all/conanfile.py @@ -65,6 +65,8 @@ def validate(self): raise ConanInvalidConfiguration("Clang version 12 or higher required") if self.settings.compiler == "apple-clang" and "armv8" == self.settings.arch : raise ConanInvalidConfiguration(f'{self.name} is still not supported by Mac M1.') + if Version(self.version) >= "2.33.0" and self.settings.compiler == "apple-clang" and Version(self.settings.compiler.version) < "14": + raise ConanInvalidConfiguration(f'{self.ref} doesn\'t support Apple-Clang < 14.') def build_requirements(self): self.tool_requires("cmake/[>=3.18.0 <4]") From 2e7068937fe40ca84c953d1484839d332f29193f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abril=20Rinc=C3=B3n=20Blanco?= Date: Tue, 13 Aug 2024 20:44:35 +0200 Subject: [PATCH 3/3] Update recipes/mold/all/conanfile.py --- recipes/mold/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/mold/all/conanfile.py b/recipes/mold/all/conanfile.py index cbd0b8b57ce98..c604d73299327 100644 --- a/recipes/mold/all/conanfile.py +++ b/recipes/mold/all/conanfile.py @@ -65,7 +65,7 @@ def validate(self): raise ConanInvalidConfiguration("Clang version 12 or higher required") if self.settings.compiler == "apple-clang" and "armv8" == self.settings.arch : raise ConanInvalidConfiguration(f'{self.name} is still not supported by Mac M1.') - if Version(self.version) >= "2.33.0" and self.settings.compiler == "apple-clang" and Version(self.settings.compiler.version) < "14": + if Version(self.version) == "2.33.0" and self.settings.compiler == "apple-clang" and Version(self.settings.compiler.version) < "14": raise ConanInvalidConfiguration(f'{self.ref} doesn\'t support Apple-Clang < 14.') def build_requirements(self):