Unverified Commit 9b874910 authored by Mislav Marohnić's avatar Mislav Marohnić
Browse files

Avoid compiling OpenSSL if the user supplied `--with-openssl-dir` on the command line 

Same with linking libyaml, gmp, etc. to Homebrew. This considers all user configuration inputs when checking for existing flags.
parent 4bf2fece

bin/ruby-build

+5 −5
Original line number Diff line number Diff line
@@ -956,7 +956,7 @@ require_llvm() { 
}



needs_yaml() {

  [[ "$RUBY_CONFIGURE_OPTS" != *--with-libyaml-dir=* ]] &&

  [[ "$RUBY_CONFIGURE_OPTS ${RUBY_CONFIGURE_OPTS_ARRAY[*]}" != *--with-libyaml-dir=* ]] &&

  ! use_homebrew_yaml

}
@@ -1049,7 +1049,7 @@ system_openssl_version() { 


# openssl gem 1.1.1

needs_openssl_096_102() {

  [[ "$RUBY_CONFIGURE_OPTS" == *--with-openssl-dir=* ]] && return 1

  [[ "$RUBY_CONFIGURE_OPTS ${RUBY_CONFIGURE_OPTS_ARRAY[*]}" == *--with-openssl-dir=* ]] && return 1

  has_broken_mac_openssl && return 0



  local version
@@ -1059,7 +1059,7 @@ needs_openssl_096_102() { 


# openssl gem 2.2.1

needs_openssl_101_111() {

  [[ "$RUBY_CONFIGURE_OPTS" == *--with-openssl-dir=* ]] && return 1

  [[ "$RUBY_CONFIGURE_OPTS ${RUBY_CONFIGURE_OPTS_ARRAY[*]}" == *--with-openssl-dir=* ]] && return 1

  has_broken_mac_openssl && return 0



  local version
@@ -1069,7 +1069,7 @@ needs_openssl_101_111() { 


# openssl gem 3.0.0

needs_openssl_102_300() {

  [[ "$RUBY_CONFIGURE_OPTS" == *--with-openssl-dir=* ]] && return 1

  [[ "$RUBY_CONFIGURE_OPTS ${RUBY_CONFIGURE_OPTS_ARRAY[*]}" == *--with-openssl-dir=* ]] && return 1

  has_broken_mac_openssl && return 0



  local version
@@ -1208,7 +1208,7 @@ build_package_ldflags_dirs() { 
}



build_package_enable_shared() {

  if [[ " ${RUBY_CONFIGURE_OPTS} " != *" --disable-shared"* ]]; then

  if [[ " ${RUBY_CONFIGURE_OPTS} ${RUBY_CONFIGURE_OPTS_ARRAY[*]}" != *" --disable-shared"* ]]; then

    package_option ruby configure --enable-shared

  fi

}