Skip to content

Commit

Permalink
(#15361) openssl: regenerate binaries
Browse files Browse the repository at this point in the history
  • Loading branch information
ericLemanissier authored Jan 19, 2023
1 parent 6b58613 commit 13e7cb0
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions recipes/openssl/1.x.x/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
required_conan_version = ">=1.53.0"

@total_ordering
class OpenSSLVersion(object):
class OpenSSLVersion:
def __init__(self, version):
self._pre = ""
version_str = str(version)
Expand Down Expand Up @@ -328,6 +328,8 @@ def _perlasm_scheme(self):

@property
def _asm_target(self):
# FIXME This function is broken since https://github.com/conan-io/conan-center-index/pull/791
# either it returns None (because the_os is not a key of the map below), or it does not return
the_os = str(self.settings.os)
if the_os in ["Android", "iOS", "watchOS", "tvOS"]:
return {
Expand Down Expand Up @@ -736,7 +738,7 @@ def build(self):
autotools.make()
else:
if self._full_version >= "1.1.0":
self.run(f'nmake /F Makefile')
self.run('nmake /F Makefile')
else: # nmake 1.0.2 support
# Note: 1.0.2 should not be used according to the OpenSSL Project
# See https://www.openssl.org/source/
Expand Down

0 comments on commit 13e7cb0

Please sign in to comment.