Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MISTAKE #1

Closed
wants to merge 5 commits into from
Closed

MISTAKE #1

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3e42571
Rubinius: Default modern versions to use Ruby 2.7
64kramsystem Mar 30, 2022
d53fab8
Fix Clang requirements for modern (20.04) Ubuntu versions
64kramsystem Mar 30, 2022
f5b309b
Rubinius: Handle the configscript name in versions from 4.6 onwards
64kramsystem Mar 30, 2022
6927ed7
Bump default Rubinius version to the latest (5.0)
64kramsystem Mar 31, 2022
b8a601f
Add Rubinius configure gettid() patch
64kramsystem Mar 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rubinius: Handle the configscript name in versions from 4.6 onwards
  • Loading branch information
@64kramsystem
64kramsystem committed Mar 30, 2022
commit f5b309b686e37473fce94f1ed880b2de5725deec
22 changes: 19 additions & 3 deletions scripts/functions/manage/rubinius
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ rubinius_install()

__rvm_cd "${rvm_src_path}/$rvm_ruby_string"

# This is not required in recent versions, but possibly is on older ones.
chmod +x ./configure

__rvm_apply_patches ||
Expand Down Expand Up @@ -149,9 +150,24 @@ rubinius_install()
then
chmod 600 "$HOME/.gem/credentials"
fi
__rvm_log_command "configure" "$rvm_ruby_string - #configuring" \
env "${rvm_configure_env[@]}" $rvm_wrappers_path/$ruby/ruby ./configure "${rvm_configure_flags[@]}" ||
return $?

# Rubinius' standard workflow is to invoke build.sh (invoking the configscript
# directly is deprecated), however, RVM splits the configure stage from the
# build one.
if __rvm_version_compare ${rvm_ruby_version} -ge 4.6
then
# On 4.6+, configure is now a wrapper around the old configscript (now
# `configure.rb`), that additionally cleans (make clean) the the libraries.
# There's no need to pass the env configuration, since it's set by the
# configscript.
__rvm_log_command "configure" "$rvm_ruby_string - #configuring" \
$rvm_wrappers_path/$ruby/ruby ./configure.rb "${rvm_configure_flags[@]}" ||
return $?
else
__rvm_log_command "configure" "$rvm_ruby_string - #configuring" \
env "${rvm_configure_env[@]}" $rvm_wrappers_path/$ruby/ruby ./configure "${rvm_configure_flags[@]}" ||
return $?
fi

if [[ -n "${rvm_configure_args:-}" ]]
then rvm_ruby_make="CONFIGURE_ARGS=${rvm_configure_args## } "
Expand Down