Skip to content

Commit

Permalink
(conan-io#24706) openssl: add version 3.3.1
Browse files Browse the repository at this point in the history
* openssl: add version `3.3.1`

* openssl 3.3.1: windows fixes

---------

Co-authored-by: Luis Caro Campos <[email protected]>
  • Loading branch information
gegles and jcar87 committed Aug 7, 2024
1 parent 235e7c4 commit 8450018
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 0 deletions.
3 changes: 3 additions & 0 deletions recipes/openssl/3.x.x/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
3.3.1:
url: "https://github.com/openssl/openssl/releases/download/openssl-3.3.1/openssl-3.3.1.tar.gz"
sha256: 777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e
3.2.2:
url: "https://github.com/openssl/openssl/releases/download/openssl-3.2.2/openssl-3.2.2.tar.gz"
sha256: 197149c18d9e9f292c43f0400acaba12e5f52cacfe050f3d199277ea738ec2e7
Expand Down
5 changes: 5 additions & 0 deletions recipes/openssl/3.x.x/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from conan.tools.gnu import AutotoolsToolchain
from conan.tools.layout import basic_layout
from conan.tools.microsoft import is_msvc, msvc_runtime_flag, unix_path
from conan.tools.scm import Version

import fnmatch
import os
Expand Down Expand Up @@ -515,6 +516,10 @@ def _make(self):
# When `--prefix=/`, the scripts derive `\` without escaping, which
# causes issues on Windows
replace_in_file(self, "Makefile", "INSTALLTOP_dir=\\", "INSTALLTOP_dir=\\\\")
if Version(self.version) >= "3.3.0":
# replace backslashes in paths with forward slashes
mkinstallvars_pl = os.path.join(self.source_folder, "util", "mkinstallvars.pl")
replace_in_file(self, mkinstallvars_pl, "$ENV{$k} = $v;", """$v =~ s|\\\\|/|g; $ENV{$k} = $v;""")
self._run_make()

def _make_install(self):
Expand Down
2 changes: 2 additions & 0 deletions recipes/openssl/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"3.3.1":
folder: "3.x.x"
"3.2.2":
folder: "3.x.x"
"3.2.1":
Expand Down

0 comments on commit 8450018

Please sign in to comment.