From a53d20cf5d31f9c348b6a6301e0a725c1f30cb86 Mon Sep 17 00:00:00 2001 From: Julien Marrec Date: Thu, 6 Jan 2022 15:49:06 +0100 Subject: [PATCH] Use openssl 1.1.1m (Ruby 2.7.2 official uses 2.1.2.. but conan only has 1.x and 3.x, 3.x does not work) https://github.com/ruby/openssl/issues/369 --- CMakeLists.txt | 2 +- conanfile.py | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 36eb98d..3330685 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ include(ExternalProject) option(INTEGRATED_CONAN "Use conan integrated into this CMake." ON) -set(OPENSSL_VERSION "1.1.0l") +set(OPENSSL_VERSION "1.1.1m") if (INTEGRATED_CONAN) ############################################################################### diff --git a/conanfile.py b/conanfile.py index ba60c34..8a3f48e 100644 --- a/conanfile.py +++ b/conanfile.py @@ -84,7 +84,7 @@ def requirements(self): """ Declare required dependencies """ - self.requires("openssl/1.1.0l") # fails with 1.1.1h https://github.com/openssl/openssl/issues/3884` + self.requires("openssl/1.1.1m") # Doesn't work with 3.x # Make sure you get a zlib post separation between zlib and minizip self.requires("zlib/1.2.11#683857dbd5377d65f26795d4023858f9") @@ -99,12 +99,6 @@ def requirements(self): # self.options["libffi"].fPIC = True if self.options.with_gdbm: - # NOTE: I have uploaded the gdbm/1.18.1 to the NREL remote - # with the status of this PR https://github.com/conan-io/conan-center-index/pull/2180 - # at SHA https://github.com/conan-io/conan-center-index/pull/2180/commits/fad6b09ec294e8c0d186caea0c38bd6941dc0343 - # So for now that'll only work if you have the NREL remote **before** - # the conan-center one... - # `conan remote update nrel https://api.bintray.com/conan/commercialbuilding/nrel --insert 0` self.requires("gdbm/1.19") # self.options["gdbm"].shared = False # self.options["gdbm"].fPIC = True