Commit db600ccd authored by Mislav Marohnić's avatar Mislav Marohnić Committed by Benoit Daloze
Browse files

TruffleRuby: remove explicit `openssl@1.1` requirement on macOS 

TruffleRuby build definitions used to explicitly rely on `brew --prefix openssl@1.1` on macOS and abort installation if that was not found. However, this check didn't take into account that the user might have set OPENSSL_PREFIX in their environment, or that they have another `openssl@*` version installed via Homebrew. This change removes the `use_homebrew_openssl` check and allows TruffleRuby to perform its own OpenSSL detection.

https://github.com/oracle/truffleruby/blob/vm-23.1.0/lib/truffle/truffle/openssl-prefix.rb#L14-L17
parent 0e4c61d8

bin/ruby-build

+1 −0
Original line number Diff line number Diff line
@@ -1068,6 +1068,7 @@ needs_openssl_102_300() { 
  (( version < 102 || version >= 400 ))

}



# Kept for backward compatibility with 3rd-party Ruby definitions.

use_homebrew_openssl() {

  local ssldir

  ssldir="$(brew --prefix openssl@1.1 2>/dev/null || true)"

script/update-truffleruby

+0 −2
Original line number Diff line number Diff line
@@ -36,12 +36,10 @@ EOS 
add_platform "linux-aarch64"

cat >> "$file" <<EOS

Darwin-x86_64)

  use_homebrew_openssl

EOS

add_platform "macos-amd64"

cat >> "$file" <<EOS

Darwin-arm64)

  use_homebrew_openssl

EOS

add_platform "macos-aarch64"

cat >> "$file" <<EOS

script/update-truffleruby-graalvm

+0 −2
Original line number Diff line number Diff line
@@ -36,12 +36,10 @@ EOS 
add_platform "linux-aarch64"

cat >> "$file" <<EOS

Darwin-x86_64)

  use_homebrew_openssl

EOS

add_platform "macos-amd64"

cat >> "$file" <<EOS

Darwin-arm64)

  use_homebrew_openssl

EOS

add_platform "macos-aarch64"

cat >> "$file" <<EOS

share/ruby-build/truffleruby+graalvm-20.1.0

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ Linux) 
  install_package "truffleruby+graalvm-20.1.0" "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/graalvm-ce-java8-linux-amd64-20.1.0.tar.gz#4fac212b37cd548831fd6587dd4d59dc068068815aa20323b47fde9529d6bb6e" truffleruby_graalvm

  ;;

Darwin)

  use_homebrew_openssl

  install_package "truffleruby+graalvm-20.1.0" "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/graalvm-ce-java8-darwin-amd64-20.1.0.tar.gz#3b9fd8ce84c9162a188fde88907c66990db22af0ff6ae2c04430113253a9a634" truffleruby_graalvm

  ;;

*)

share/ruby-build/truffleruby+graalvm-20.2.0

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ Linux) 
  install_package "truffleruby+graalvm-20.2.0" "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/graalvm-ce-java8-linux-amd64-20.2.0.tar.gz#60951c774c708caeebd1fa3886c05aa1260d81c7595ede0c9c3e689be7fcc4e8" truffleruby_graalvm

  ;;

Darwin)

  use_homebrew_openssl

  install_package "truffleruby+graalvm-20.2.0" "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/graalvm-ce-java8-darwin-amd64-20.2.0.tar.gz#a1f524788354cfd2434566f0de972372f4a7743919bae49a9d508f2080385e7b" truffleruby_graalvm

  ;;

*)