mirrors/rbenv-ruby-build
1
0
Fork 0
mirror of https://github.com/rbenv/ruby-build.git synced 2025-10-27 15:21:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Same with linking libyaml, gmp, etc. to Homebrew. This considers all user configuration inputs when checking for existing flags.
This commit is contained in:
Mislav Marohnić 2023-10-13 18:51:10 +02:00
parent 4bf2fece5e
commit 9b8749105f
No known key found for this signature in database
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
bin/ruby-build
View file

@ -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
}