Skip to content

Commit 5116d3d

Browse files
committed
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)
ruby/openssl#369
1 parent b9b68a0 commit 5116d3d

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ include(ExternalProject)
88

99
option(INTEGRATED_CONAN "Use conan integrated into this CMake." ON)
1010

11-
set(OPENSSL_VERSION "1.1.0l")
11+
set(OPENSSL_VERSION "1.1.1m")
1212

1313
if (INTEGRATED_CONAN)
1414
###############################################################################

conanfile.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def requirements(self):
7676
"""
7777
Declare required dependencies
7878
"""
79-
self.requires("openssl/1.1.0l") # fails with 1.1.1h https://github.com/openssl/openssl/issues/3884`
79+
self.requires("openssl/1.1.1m") # Doesn't work with 3.x
8080
self.requires("zlib/1.2.11")
8181

8282
if self.options.with_libyaml:
@@ -90,12 +90,6 @@ def requirements(self):
9090
# self.options["libffi"].fPIC = True
9191

9292
if self.options.with_gdbm:
93-
# NOTE: I have uploaded the gdbm/1.18.1 to the NREL remote
94-
# with the status of this PR https://github.com/conan-io/conan-center-index/pull/2180
95-
# at SHA https://github.com/conan-io/conan-center-index/pull/2180/commits/fad6b09ec294e8c0d186caea0c38bd6941dc0343
96-
# So for now that'll only work if you have the NREL remote **before**
97-
# the conan-center one...
98-
# `conan remote update nrel https://api.bintray.com/conan/commercialbuilding/nrel --insert 0`
9993
self.requires("gdbm/1.19")
10094
# self.options["gdbm"].shared = False
10195
# self.options["gdbm"].fPIC = True

0 commit comments

Comments
 (0)