diff --git a/libs/openssl/openssl.py b/libs/openssl/openssl.py --- a/libs/openssl/openssl.py +++ b/libs/openssl/openssl.py @@ -34,18 +34,18 @@ self.targetDigestUrls[ver] = ([f'{baseUrl}openssl-{ver}.tar.gz.sha256'], CraftHash.HashAlgorithm.SHA256) # latest versions -> inside source/ - for ver in ["1.0.2s", "1.1.1d"]: + for ver in ["1.0.2s", "1.1.1f"]: baseUrl = 'https://openssl.org/source/' addTarget(baseUrl, ver) - self.patchLevel["1.1.1d"] = 1 + self.patchLevel["1.1.1f"] = 1 self.description = "The OpenSSL runtime environment" #set the default config for openssl 1.1 self.options.configure.args = "shared no-zlib threads no-rc5 no-idea no-ssl3-method no-weak-ssl-ciphers no-heartbeats no-dynamic-engine" - self.defaultTarget = '1.1.1d' + self.defaultTarget = '1.1.1f' def setDependencies(self): self.runtimeDependencies["virtual/base"] = None @@ -191,8 +191,9 @@ return False # we don't want people to link to the static build but openssl doesn't provide an option to # disable the static build - return (utils.deleteFile(os.path.join(self.installDir(), "lib", "libcrypto.a")) and - utils.deleteFile(os.path.join(self.installDir(), "lib", "libssl.a"))) + libdir = "lib64" if path.isdir(os.path.join(self.installDir(), "lib64")) else "lib" + return (utils.deleteFile(os.path.join(self.installDir(), libdir, "libcrypto.a")) and + utils.deleteFile(os.path.join(self.installDir(), libdir, "libssl.a"))) else: self.enterSourceDir() self.shell.execute(self.sourceDir(), self.makeProgram,