From ef5bc6d3d5965a02f603c72da1d20db6d2009723 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Thu, 30 Nov 2023 12:57:14 +0100 Subject: [PATCH] Use custom CPython 3.10.4 and OpenSSL 3.2.0 Due to changes made to the recipes up stream, and some tweaks to our own cpython recipe. We can now build cpython with the newest OpenSSL version Contribute to CURA-11080 --- conanfile.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 48cba847be..18ad185d6a 100644 --- a/conanfile.py +++ b/conanfile.py @@ -307,6 +307,7 @@ class CuraConan(ConanFile): self.options["pynest2d"].shared = True self.options["dulcificum"].shared = self.settings.os != "Windows" self.options["cpython"].shared = True + self.options["openssl"].shared = True self.options["boost"].header_only = True if self.settings.os == "Linux": self.options["curaengine_grpc_definitions"].shared = True @@ -329,7 +330,8 @@ class CuraConan(ConanFile): self.requires("curaengine_plugin_gradual_flow/0.1.0") self.requires("uranium/(latest)@ultimaker/testing") self.requires("cura_binary_data/(latest)@ultimaker/testing") - self.requires("cpython/3.10.4") + self.requires("cpython/3.10.4@ultimaker/stable") + self.requires("openssl/3.2.0") if self.options.internal: self.requires("cura_private_data/(latest)@internal/testing") self.requires("fdm_materials/(latest)@internal/testing")