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

libcoro: add version 0.11.1 #22764

Merged
merged 16 commits into from
Feb 19, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions recipes/libcoro/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"0.11.1":
url: "https://github.com/jbaldwin/libcoro/archive/refs/tags/v0.11.1.tar.gz"
sha256: "c7eb1bf133519ec0e0bc2e3e018ac4d1447a143e5e7385dab19204277d7c7671"
"0.10":
url: "https://github.com/jbaldwin/libcoro/archive/refs/tags/v0.10.tar.gz"
sha256: "0e952e72012925b75910f80772f3642dac631644578dbbc0db4fee047badc745"
Expand Down Expand Up @@ -27,8 +30,8 @@
- patch_file: "patches/0.9-0002-disable-git-config.patch"
patch_type: "conan"
patch_description: "Comment out invocation of git config command"
- patch_file: "patches/0.9-0003-include-exception.patch"
patch_type: "backport"

Check warning on line 34 in recipes/libcoro/all/conandata.yml

View workflow job for this annotation

GitHub Actions / Lint changed files (YAML files)

conandata.yml schema warning

Schema outlined in https://github.com/conan-io/conan-center-index/blob/master/docs/adding_packages/conandata_yml_format.md#patches-fields is not followed. found arbitrary text in patch_type: backport ^ (line: 34)
patch_source: "https://github.com/jbaldwin/libcoro/pull/169"
patch_description: "include std headers"
"0.8":
Expand Down
21 changes: 15 additions & 6 deletions recipes/libcoro/all/conanfile.py
uilianries marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,12 @@ def _min_cppstd(self):
@property
def _minimum_compilers_version(self):
return {
"gcc": "10.2.1",
}
"gcc": "10.2.1",
"clang": "16.0.0",
"apple-clang": "13",
uilianries marked this conversation as resolved.
Show resolved Hide resolved
"Visual Studio": "16",
"msvc": "192",
}

def export_sources(self):
export_conandata_patches(self)
Expand Down Expand Up @@ -71,10 +75,11 @@ def requirements(self):
def validate(self):
if self.settings.compiler.get_safe("cppstd"):
check_min_cppstd(self, self._min_cppstd)
if self.settings.os not in ["Linux", "FreeBSD", "Macos"]:
raise ConanInvalidConfiguration(f"{self.ref} is not supported on {self.settings.os}.")
if self.settings.compiler != "gcc":
raise ConanInvalidConfiguration(f"The Conan recipe {self.ref} only supports GCC for now. Contributions are welcome!")
if Version(self.version) < "0.10":
if self.settings.os not in ["Linux", "FreeBSD", "Macos"]:
raise ConanInvalidConfiguration(f"{self.ref} is not supported on {self.settings.os}.")
if self.settings.compiler != "gcc":
raise ConanInvalidConfiguration(f"The Conan recipe {self.ref} only supports GCC for now. Contributions are welcome!")

minimum_version = self._minimum_compilers_version.get(str(self.settings.compiler), False)
if minimum_version and Version(self.settings.compiler.version) < minimum_version:
Expand All @@ -95,6 +100,10 @@ def generate(self):
if Version(self.version) >= "0.9":
tc.variables["LIBCORO_FEATURE_THREADING"] = self.options.with_threading
tc.variables["LIBCORO_FEATURE_SSL"] = self.options.with_ssl
if Version(self.version) >= "0.11":
tc.variables["LIBCORO_RUN_GITCONFIG"] = False
tc.variables["LIBCORO_BUILD_SHARED_LIBS"] = self.options.shared
tc.variables["LIBCORO_FEATURE_TLS"] = self.options.with_ssl
tc.generate()
deps = CMakeDeps(self)
deps.generate()
Expand Down
2 changes: 2 additions & 0 deletions recipes/libcoro/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"0.11.1":
folder: all
"0.10":
folder: all
"0.9":
Expand Down
Loading