Used openssl 1.1 for macos

tamatebako · Jul 18, 2023 · 42044bb · 42044bb
1 parent 8964066
commit 42044bb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -122,7 +122,7 @@ task:
   install_script: |
     brew install gnu-sed bash pkg-config bison flex binutils   \
     libffi double-conversion boost jemalloc fmt glog libevent  \
-    libsodium lz4 xz gdbm zlib ncurses libyaml openssl@3
+    libsodium lz4 xz gdbm zlib ncurses libyaml openssl@1.1
 
   pre-setup_script: |
     cat common.env >> $CIRRUS_ENV

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -174,7 +174,7 @@ elseif("${OSTYPE_TXT}" MATCHES "^msys*")
   set(RUBY_MAKEFILE "--file=GNUmakefile")
 elseif("${OSTYPE_TXT}" MATCHES "^darwin.*")
   set(IS_DARWIN ON)
-  set(BUILD_OPENSSL_ROOT_DIR "${BUILD_BREW_PREFIX}/opt/openssl@3")
+  set(BUILD_OPENSSL_ROOT_DIR "${BUILD_BREW_PREFIX}/opt/openssl@1.1")
 endif()
 
 # Various locations for external projects
@@ -415,7 +415,7 @@ if(IS_DARWIN)
     set(OPENSSL_VER "1.1")
   else(${RUBY_VER} VERSION_LESS "3.2.2")
     set(OPENSSL_VER "3")
-  endif(${RUBY_VER} VERSION_LESS "3.2.2")  
+  endif(${RUBY_VER} VERSION_LESS "3.2.2")
   string(CONCAT RUBY_C_FLAGS ${RUBY_C_FLAGS} " -I${BUILD_BREW_PREFIX}/include -I${BUILD_BREW_PREFIX}/opt/openssl@${OPENSSL_VER}/include -I${BUILD_BREW_PREFIX}/opt/zlib/include")
   string(CONCAT RUBY_L_FLAGS ${RUBY_L_FLAGS} " -L${BUILD_BREW_PREFIX}/lib -L${BUILD_BREW_PREFIX}/opt/openssl@${OPENSSL_VER}/lib -L${BUILD_BREW_PREFIX}/opt/zlib/lib")
   set(OPENSSL_RUBY_OPTION "--with-openssl-dir=${BUILD_BREW_PREFIX}/opt/openssl@${OPENSSL_VER}")

diff --git a/lib/tebako/packager/patch_literals.rb b/lib/tebako/packager/patch_literals.rb
@@ -239,7 +239,7 @@ module PatchLiterals
 
       # rubocop:disable Style/WordArray
       DARWIN_BREW_LIBS = [
-        ["openssl@3", "ssl"],     ["openssl@3", "crypto"],    ["zlib", "z"],            ["gdbm", "gdbm"],
+        ["openssl@1.1", "ssl"],   ["openssl@1.1", "crypto"],  ["zlib", "z"],            ["gdbm", "gdbm"],
         ["readline", "readline"], ["libffi", "ffi"],          ["ncurses", "ncurses"],   ["fmt", "fmt"],
         ["lz4", "lz4"],           ["xz", "lzma"],             ["libyaml", "yaml"],
         ["double-conversion", "double-conversion"]