Skip to content

Commit

Permalink
Use openssl 1.1.1m (Ruby 2.7.2 official uses 2.1.2.. but conan only h…
Browse files Browse the repository at this point in the history
…as 1.x and 3.x, 3.x does not work)

ruby/openssl#369
  • Loading branch information
jmarrec committed Jan 17, 2022
1 parent 2281ae9 commit a53d20c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
###############################################################################
Expand Down
8 changes: 1 addition & 7 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand All @@ -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
Expand Down

0 comments on commit a53d20c

Please sign in to comment.