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.

Sign up for GitHub

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

[openssl] Add new version of OpenSSL 3.4.0 #26530

Closed
wants to merge 2 commits into from
Closed

[openssl] Add new version of OpenSSL 3.4.0 #26530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69a6c64
Add support for version 3.4.0 of OpenSSL.
datalogics-robb Feb 4, 2025
f614839
Eliminate the use of settings_build" in OpenSSL 3 recipe.
datalogics-robb Feb 4, 2025
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/openssl/3.x.x/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
3.4.0:
url: "https://github.com/openssl/openssl/releases/download/openssl-3.4.0/openssl-3.4.0.tar.gz"
sha256: e15dda82fe2fe8139dc2ac21a36d4ca01d5313c75f99f46c4e8a27709b7294bf
3.3.2:
url: "https://github.com/openssl/openssl/releases/download/openssl-3.3.2/openssl-3.3.2.tar.gz"
sha256: 2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281
Expand Down
6 changes: 5 additions & 1 deletion recipes/openssl/3.x.x/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,10 @@ class OpenSSLConan(ConanFile):
default_options["openssldir"] = None
default_options["tls_security_level"] = None

@property
def _settings_build(self):
return getattr(self, "settings_build", self.settings)

@property
def _is_clang_cl(self):
return self.settings.os == "Windows" and self.settings.compiler == "clang" and \
Expand Down Expand Up @@ -143,7 +147,7 @@ def validate(self):
raise ConanInvalidConfiguration("OpenSSL 3 does not support building shared libraries for iOS")

def build_requirements(self):
if self.settings_build.os == "Windows":
if self._settings_build.os == "Windows":
Copy link

Choose a reason for hiding this comment

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

why don't you use here if self.settings.os == "Windows": directly?

if self.conf.get("user.openssl:windows_use_jom", False):
self.tool_requires("jom/[*]")
if not self.options.no_asm and self.settings.arch in ["x86", "x86_64"]:
Expand Down
2 changes: 2 additions & 0 deletions recipes/openssl/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"3.4.0":
folder: "3.x.x"
"3.3.2":
folder: "3.x.x"
"3.2.3":
Expand Down