From 8cc6a837f0b9c81841dcc4503f7ed791330a5d40 Mon Sep 17 00:00:00 2001 From: toge Date: Wed, 14 Feb 2024 01:50:59 +0900 Subject: [PATCH 01/13] libcoro: add version 0.11 --- recipes/libcoro/all/conandata.yml | 3 +++ recipes/libcoro/all/conanfile.py | 2 ++ recipes/libcoro/config.yml | 2 ++ 3 files changed, 7 insertions(+) diff --git a/recipes/libcoro/all/conandata.yml b/recipes/libcoro/all/conandata.yml index 2ae02b6941d0a..b23a5a49d65d2 100644 --- a/recipes/libcoro/all/conandata.yml +++ b/recipes/libcoro/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "0.11": + url: "https://github.com/jbaldwin/libcoro/archive/refs/tags/v0.11.tar.gz" + sha256: "afc844d5efe71c64e07165dafd42a2c317fd87f60588616c23512451c2b05c72" "0.10": url: "https://github.com/jbaldwin/libcoro/archive/refs/tags/v0.10.tar.gz" sha256: "0e952e72012925b75910f80772f3642dac631644578dbbc0db4fee047badc745" diff --git a/recipes/libcoro/all/conanfile.py b/recipes/libcoro/all/conanfile.py index 7873b320afe48..9477976cc62c1 100644 --- a/recipes/libcoro/all/conanfile.py +++ b/recipes/libcoro/all/conanfile.py @@ -95,6 +95,8 @@ 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_BUILD_SHARED_LIBS"] = self.options.shared tc.generate() deps = CMakeDeps(self) deps.generate() diff --git a/recipes/libcoro/config.yml b/recipes/libcoro/config.yml index 5808152f9189f..ac2c19b16c278 100644 --- a/recipes/libcoro/config.yml +++ b/recipes/libcoro/config.yml @@ -1,4 +1,6 @@ versions: + "0.11": + folder: all "0.10": folder: all "0.9": From 50983d5ae6e46096ddcacfcf833327df23520805 Mon Sep 17 00:00:00 2001 From: toge Date: Wed, 14 Feb 2024 12:03:50 +0900 Subject: [PATCH 02/13] relax compiler checks --- recipes/libcoro/all/conanfile.py | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/recipes/libcoro/all/conanfile.py b/recipes/libcoro/all/conanfile.py index 9477976cc62c1..74c381511d5b7 100644 --- a/recipes/libcoro/all/conanfile.py +++ b/recipes/libcoro/all/conanfile.py @@ -39,9 +39,18 @@ def _min_cppstd(self): @property def _minimum_compilers_version(self): - return { - "gcc": "10.2.1", - } + if Version(self.version) < "0.10": + return { + "gcc": "10.2.1", + } + else: + return { + "gcc": "10.2.1", + "clang": "16.0.0", + "apple-clang": "13", + "Visual Studio": "16", + "msvc": "192", + } def export_sources(self): export_conandata_patches(self) @@ -71,10 +80,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: From a52f65042277027f8cbe56f76f1e5ae217b399ae Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Wed, 14 Feb 2024 17:20:20 +0100 Subject: [PATCH 03/13] update to version 0.11.1 Signed-off-by: Uilian Ries --- recipes/libcoro/all/conandata.yml | 6 +++--- recipes/libcoro/all/conanfile.py | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/recipes/libcoro/all/conandata.yml b/recipes/libcoro/all/conandata.yml index b23a5a49d65d2..53036785b7f90 100644 --- a/recipes/libcoro/all/conandata.yml +++ b/recipes/libcoro/all/conandata.yml @@ -1,7 +1,7 @@ sources: - "0.11": - url: "https://github.com/jbaldwin/libcoro/archive/refs/tags/v0.11.tar.gz" - sha256: "afc844d5efe71c64e07165dafd42a2c317fd87f60588616c23512451c2b05c72" + "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" diff --git a/recipes/libcoro/all/conanfile.py b/recipes/libcoro/all/conanfile.py index 74c381511d5b7..4e3abc84f5eff 100644 --- a/recipes/libcoro/all/conanfile.py +++ b/recipes/libcoro/all/conanfile.py @@ -106,7 +106,9 @@ def generate(self): 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() From 02a83ae23d1c261e0854c9cb0bf316204e0e1e68 Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Wed, 14 Feb 2024 17:23:03 +0100 Subject: [PATCH 04/13] require newer compilers Signed-off-by: Uilian Ries --- recipes/libcoro/all/conanfile.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/recipes/libcoro/all/conanfile.py b/recipes/libcoro/all/conanfile.py index 4e3abc84f5eff..8c20119be3204 100644 --- a/recipes/libcoro/all/conanfile.py +++ b/recipes/libcoro/all/conanfile.py @@ -39,12 +39,7 @@ def _min_cppstd(self): @property def _minimum_compilers_version(self): - if Version(self.version) < "0.10": - return { - "gcc": "10.2.1", - } - else: - return { + return { "gcc": "10.2.1", "clang": "16.0.0", "apple-clang": "13", From a86e095b29324070ca52440fef6fe48d91007f15 Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Wed, 14 Feb 2024 17:36:34 +0100 Subject: [PATCH 05/13] update config Signed-off-by: Uilian Ries --- recipes/libcoro/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/libcoro/config.yml b/recipes/libcoro/config.yml index ac2c19b16c278..a682e35c6d452 100644 --- a/recipes/libcoro/config.yml +++ b/recipes/libcoro/config.yml @@ -1,5 +1,5 @@ versions: - "0.11": + "0.11.1": folder: all "0.10": folder: all From 3fada578baa1ec9f166d9a6f71f76e10ab608f75 Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Wed, 14 Feb 2024 18:06:13 +0100 Subject: [PATCH 06/13] Update recipes/libcoro/all/conanfile.py --- recipes/libcoro/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/libcoro/all/conanfile.py b/recipes/libcoro/all/conanfile.py index 8c20119be3204..8b9c3ec5ab639 100644 --- a/recipes/libcoro/all/conanfile.py +++ b/recipes/libcoro/all/conanfile.py @@ -42,7 +42,7 @@ def _minimum_compilers_version(self): return { "gcc": "10.2.1", "clang": "16.0.0", - "apple-clang": "13", + "apple-clang": "16", "Visual Studio": "16", "msvc": "192", } From ea4502068028dec2eac35d652b7a9f694a0cb60c Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Thu, 15 Feb 2024 11:24:29 +0100 Subject: [PATCH 07/13] fix library name on Windows Signed-off-by: Uilian Ries --- recipes/libcoro/all/conanfile.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/libcoro/all/conanfile.py b/recipes/libcoro/all/conanfile.py index 8c20119be3204..e3435541b522d 100644 --- a/recipes/libcoro/all/conanfile.py +++ b/recipes/libcoro/all/conanfile.py @@ -1,6 +1,7 @@ from conan import ConanFile from conan.errors import ConanInvalidConfiguration from conan.tools.build import check_min_cppstd +from conan.tools.microsoft import is_msvc from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, rmdir from conan.tools.scm import Version @@ -124,7 +125,7 @@ def package_info(self): self.cpp_info.set_property("cmake_file_name", "libcoro") self.cpp_info.set_property("cmake_target_name", "libcoro::libcoro") if Version(self.version) >= "0.8": - self.cpp_info.libs = ["coro"] + self.cpp_info.libs = ["libcoro"] if is_msvc(self) else ["coro"] else: self.cpp_info.libs = ["libcoro"] if self.settings.os in ["Linux", "FreeBSD"]: From d7fbd49329e3d7601a490394c26ef862cc79880b Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Fri, 16 Feb 2024 15:15:10 +0100 Subject: [PATCH 08/13] some options are not available on Windows Signed-off-by: Uilian Ries --- recipes/libcoro/all/conanfile.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/recipes/libcoro/all/conanfile.py b/recipes/libcoro/all/conanfile.py index 68cd12723f46e..521285af334d3 100644 --- a/recipes/libcoro/all/conanfile.py +++ b/recipes/libcoro/all/conanfile.py @@ -59,6 +59,9 @@ def config_options(self): if Version(self.version) < "0.9": del self.options.with_ssl del self.options.with_threading + if is_msvc(self) or self.settings.os == "Emscripten": + self.options.rm_safe("with_networking") + self.options.rm_safe("with_ssl") def configure(self): if self.options.shared: @@ -97,14 +100,14 @@ def generate(self): tc.variables["LIBCORO_BUILD_EXAMPLES"] = False if Version(self.version) >= "0.8": tc.variables["LIBCORO_EXTERNAL_DEPENDENCIES"] = True - tc.variables["LIBCORO_FEATURE_NETWORKING"] = self.options.with_networking + tc.variables["LIBCORO_FEATURE_NETWORKING"] = self.options.get_safe("with_networking") if Version(self.version) >= "0.9": tc.variables["LIBCORO_FEATURE_THREADING"] = self.options.with_threading - tc.variables["LIBCORO_FEATURE_SSL"] = self.options.with_ssl + tc.variables["LIBCORO_FEATURE_SSL"] = self.options.get_safe("with_ssl", False) 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.variables["LIBCORO_FEATURE_TLS"] = self.options.get_safe("with_ssl", False) tc.generate() deps = CMakeDeps(self) deps.generate() @@ -132,9 +135,9 @@ def package_info(self): self.cpp_info.system_libs = ["pthread", "m"] if Version(self.version) >= "0.9": - if self.options.with_networking: + if self.options.get_safe("with_networking"): self.cpp_info.defines.append("LIBCORO_FEATURE_NETWORKING") - if self.options.with_ssl: - self.cpp_info.defines.append("LIBCORO_FEATURE_SSL") + if self.options.get_safe("with_ssl"): + self.cpp_info.defines.extends(["LIBCORO_FEATURE_SSL", "LIBCORO_FEATURE_TLS"]) if self.options.with_threading: self.cpp_info.defines.append("LIBCORO_FEATURE_THREADING") From 2514ba9c0b019dab79e90bde1acdd09747583b73 Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Fri, 16 Feb 2024 16:02:26 +0100 Subject: [PATCH 09/13] typo Signed-off-by: Uilian Ries --- recipes/libcoro/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/libcoro/all/conanfile.py b/recipes/libcoro/all/conanfile.py index 521285af334d3..240bc4be6f447 100644 --- a/recipes/libcoro/all/conanfile.py +++ b/recipes/libcoro/all/conanfile.py @@ -138,6 +138,6 @@ def package_info(self): if self.options.get_safe("with_networking"): self.cpp_info.defines.append("LIBCORO_FEATURE_NETWORKING") if self.options.get_safe("with_ssl"): - self.cpp_info.defines.extends(["LIBCORO_FEATURE_SSL", "LIBCORO_FEATURE_TLS"]) + self.cpp_info.defines.extend(["LIBCORO_FEATURE_SSL", "LIBCORO_FEATURE_TLS"]) if self.options.with_threading: self.cpp_info.defines.append("LIBCORO_FEATURE_THREADING") From 168db30e5d93aaa34e0bd5c597dac3c5ba255b4e Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Fri, 16 Feb 2024 17:14:31 +0100 Subject: [PATCH 10/13] disable shared Signed-off-by: Uilian Ries --- recipes/libcoro/all/conandata.yml | 12 ------------ recipes/libcoro/all/conanfile.py | 6 +++++- .../all/patches/0.10-0001-allow-shared-lib.patch | 13 ------------- .../all/patches/0.7-0001-allow-shared-lib.patch | 9 --------- .../all/patches/0.8-0001-allow-shared-lib.patch | 13 ------------- .../all/patches/0.9-0001-allow-shared-lib.patch | 13 ------------- 6 files changed, 5 insertions(+), 61 deletions(-) delete mode 100644 recipes/libcoro/all/patches/0.10-0001-allow-shared-lib.patch delete mode 100644 recipes/libcoro/all/patches/0.7-0001-allow-shared-lib.patch delete mode 100644 recipes/libcoro/all/patches/0.8-0001-allow-shared-lib.patch delete mode 100644 recipes/libcoro/all/patches/0.9-0001-allow-shared-lib.patch diff --git a/recipes/libcoro/all/conandata.yml b/recipes/libcoro/all/conandata.yml index 53036785b7f90..1587140b431f7 100644 --- a/recipes/libcoro/all/conandata.yml +++ b/recipes/libcoro/all/conandata.yml @@ -16,17 +16,11 @@ sources: sha256: "ce1f3f1c4fa21b53d1cd195a29bd5a2313e53aa35637b402db04207d02316e51" patches: "0.10": - - patch_file: "patches/0.10-0001-allow-shared-lib.patch" - patch_type: "conan" - patch_description: "Allow to build the library as a shared library" - patch_file: "patches/0.10-0002-disable-git-config.patch" patch_type: "official" patch_description: "Comment out invocation of git config command" patch_source: "https://github.com/jbaldwin/libcoro/pull/234" "0.9": - - patch_file: "patches/0.9-0001-allow-shared-lib.patch" - patch_type: "conan" - patch_description: "Allow to build the library as a shared library" - patch_file: "patches/0.9-0002-disable-git-config.patch" patch_type: "conan" patch_description: "Comment out invocation of git config command" @@ -35,16 +29,10 @@ patches: patch_source: "https://github.com/jbaldwin/libcoro/pull/169" patch_description: "include std headers" "0.8": - - patch_file: "patches/0.8-0001-allow-shared-lib.patch" - patch_type: "conan" - patch_description: "Allow to build the library as a shared library" - patch_file: "patches/0.8-0002-disable-git-config.patch" patch_type: "conan" patch_description: "Comment out invocation of git config command" "0.7": - - patch_file: "patches/0.7-0001-allow-shared-lib.patch" - patch_type: "conan" - patch_description: "Allow to build the library as a shared library" - patch_file: "patches/0.7-0002-disable-git-config.patch" patch_type: "conan" patch_description: "Comment out invocation of git config command" diff --git a/recipes/libcoro/all/conanfile.py b/recipes/libcoro/all/conanfile.py index 240bc4be6f447..51134479149a8 100644 --- a/recipes/libcoro/all/conanfile.py +++ b/recipes/libcoro/all/conanfile.py @@ -59,13 +59,17 @@ def config_options(self): if Version(self.version) < "0.9": del self.options.with_ssl del self.options.with_threading + if Version(self.version) < "0.11": + del self.options.shared if is_msvc(self) or self.settings.os == "Emscripten": self.options.rm_safe("with_networking") self.options.rm_safe("with_ssl") def configure(self): - if self.options.shared: + if self.options.get_safe("shared"): self.options.rm_safe("fPIC") + if Version(self.version) < "0.11": + self.package_type = "static-library" def layout(self): cmake_layout(self, src_folder="src") diff --git a/recipes/libcoro/all/patches/0.10-0001-allow-shared-lib.patch b/recipes/libcoro/all/patches/0.10-0001-allow-shared-lib.patch deleted file mode 100644 index 8eb0ed04c1cfc..0000000000000 --- a/recipes/libcoro/all/patches/0.10-0001-allow-shared-lib.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b749c11..7398569 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -123,7 +123,7 @@ if(DEFINED EMSCRIPTEN) - add_link_options(-sEXIT_RUNTIME) - endif() - --add_library(${PROJECT_NAME} STATIC ${LIBCORO_SOURCE_FILES}) -+add_library(${PROJECT_NAME} ${LIBCORO_SOURCE_FILES}) - set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX PREFIX "") - target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_20) - target_include_directories(${PROJECT_NAME} PUBLIC include) diff --git a/recipes/libcoro/all/patches/0.7-0001-allow-shared-lib.patch b/recipes/libcoro/all/patches/0.7-0001-allow-shared-lib.patch deleted file mode 100644 index 9c3ca8de19231..0000000000000 --- a/recipes/libcoro/all/patches/0.7-0001-allow-shared-lib.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -69,4 +69,4 @@ - ) - --add_library(${PROJECT_NAME} STATIC ${LIBCORO_SOURCE_FILES}) -+add_library(${PROJECT_NAME} ${LIBCORO_SOURCE_FILES}) - set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX) diff --git a/recipes/libcoro/all/patches/0.8-0001-allow-shared-lib.patch b/recipes/libcoro/all/patches/0.8-0001-allow-shared-lib.patch deleted file mode 100644 index 0481b258f7f9a..0000000000000 --- a/recipes/libcoro/all/patches/0.8-0001-allow-shared-lib.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f37206b..8221a5d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -91,7 +91,7 @@ if(LIBCORO_FEATURE_NETWORKING) - ) - endif() - --add_library(${PROJECT_NAME} STATIC ${LIBCORO_SOURCE_FILES}) -+add_library(${PROJECT_NAME} ${LIBCORO_SOURCE_FILES}) - set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX PREFIX "") - target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_20) - target_include_directories(${PROJECT_NAME} PUBLIC inc) diff --git a/recipes/libcoro/all/patches/0.9-0001-allow-shared-lib.patch b/recipes/libcoro/all/patches/0.9-0001-allow-shared-lib.patch deleted file mode 100644 index 4838c6103aa0f..0000000000000 --- a/recipes/libcoro/all/patches/0.9-0001-allow-shared-lib.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ef0eea4..4c342e3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -110,7 +110,7 @@ if(LIBCORO_FEATURE_NETWORKING) - endif() - endif() - --add_library(${PROJECT_NAME} STATIC ${LIBCORO_SOURCE_FILES}) -+add_library(${PROJECT_NAME} ${LIBCORO_SOURCE_FILES}) - set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX PREFIX "") - target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_20) - target_include_directories(${PROJECT_NAME} PUBLIC inc) From 4122cd969ba0d962b506a9580fb6c40af962e7a2 Mon Sep 17 00:00:00 2001 From: toge Date: Sat, 17 Feb 2024 01:19:21 +0900 Subject: [PATCH 11/13] set CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS --- recipes/libcoro/all/conanfile.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/libcoro/all/conanfile.py b/recipes/libcoro/all/conanfile.py index 240bc4be6f447..8d31bd828faf0 100644 --- a/recipes/libcoro/all/conanfile.py +++ b/recipes/libcoro/all/conanfile.py @@ -104,6 +104,8 @@ 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.get_safe("with_ssl", False) + if Version(self.version) >= "0.10": + tc.variables["CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS"] = True if Version(self.version) >= "0.11": tc.variables["LIBCORO_RUN_GITCONFIG"] = False tc.variables["LIBCORO_BUILD_SHARED_LIBS"] = self.options.shared From 31e6e794cd5e29e9bdacf2cd3b54790c63b1904d Mon Sep 17 00:00:00 2001 From: toge Date: Sat, 17 Feb 2024 01:22:19 +0900 Subject: [PATCH 12/13] revert CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS --- recipes/libcoro/all/conanfile.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes/libcoro/all/conanfile.py b/recipes/libcoro/all/conanfile.py index 66c3160031ffa..51134479149a8 100644 --- a/recipes/libcoro/all/conanfile.py +++ b/recipes/libcoro/all/conanfile.py @@ -108,8 +108,6 @@ 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.get_safe("with_ssl", False) - if Version(self.version) >= "0.10": - tc.variables["CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS"] = True if Version(self.version) >= "0.11": tc.variables["LIBCORO_RUN_GITCONFIG"] = False tc.variables["LIBCORO_BUILD_SHARED_LIBS"] = self.options.shared From 086a23c545b90602c5410c153497050e90286d71 Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Fri, 16 Feb 2024 17:44:23 +0100 Subject: [PATCH 13/13] manage shared option Signed-off-by: Uilian Ries --- recipes/libcoro/all/conanfile.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes/libcoro/all/conanfile.py b/recipes/libcoro/all/conanfile.py index 51134479149a8..60b120e4f9dc5 100644 --- a/recipes/libcoro/all/conanfile.py +++ b/recipes/libcoro/all/conanfile.py @@ -59,14 +59,12 @@ def config_options(self): if Version(self.version) < "0.9": del self.options.with_ssl del self.options.with_threading - if Version(self.version) < "0.11": - del self.options.shared if is_msvc(self) or self.settings.os == "Emscripten": self.options.rm_safe("with_networking") self.options.rm_safe("with_ssl") def configure(self): - if self.options.get_safe("shared"): + if self.options.shared: self.options.rm_safe("fPIC") if Version(self.version) < "0.11": self.package_type = "static-library" @@ -95,6 +93,9 @@ def validate(self): f"{self.ref} requires C++{self._min_cppstd}, which your compiler does not support." ) + if Version(self.version) < "0.11" and self.options.shared: + raise ConanInvalidConfiguration(f"{self.ref} Only supports shared linking for versions >=0.11") + def source(self): get(self, **self.conan_data["sources"][self.version], strip_root=True)