Upgrade to Ruby 2.6.0.

This commit is contained in:
Vít Ondruch 2019-01-04 11:03:01 +01:00
commit 06da21a344
11 changed files with 542 additions and 117 deletions

View file

@ -20,7 +20,7 @@ diff --git a/configure.ac b/configure.ac
index 8ea969412f..a00f2b6776 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3648,9 +3648,6 @@ AS_CASE(["$target_os"],
@@ -3660,9 +3660,6 @@ AS_CASE(["$target_os"],
rubyw_install_name='$(RUBYW_INSTALL_NAME)'
])
@ -30,7 +30,7 @@ index 8ea969412f..a00f2b6776 100644
rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
AC_ARG_WITH(rubyarchprefix,
AS_HELP_STRING([--with-rubyarchprefix=DIR],
@@ -3673,56 +3670,62 @@ AC_ARG_WITH(ridir,
@@ -3685,56 +3682,62 @@ AC_ARG_WITH(ridir,
AC_SUBST(ridir)
AC_SUBST(RI_BASE_NAME)
@ -120,7 +120,7 @@ index 8ea969412f..a00f2b6776 100644
AS_IF([test "${LOAD_RELATIVE+set}"], [
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
@@ -3739,6 +3742,7 @@ AC_SUBST(sitearchincludedir)dnl
@@ -3751,6 +3754,7 @@ AC_SUBST(sitearchincludedir)dnl
AC_SUBST(arch)dnl
AC_SUBST(sitearch)dnl
AC_SUBST(ruby_version)dnl
@ -245,7 +245,7 @@ diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
index 0428bea..b6e090e 100644
--- a/test/rubygems/test_gem.rb
+++ b/test/rubygems/test_gem.rb
@@ -1278,7 +1278,8 @@ def test_self_use_paths
@@ -1280,7 +1280,8 @@ def test_self_use_paths
def test_self_user_dir
parts = [@userhome, '.gem', Gem.ruby_engine]
@ -255,7 +255,7 @@ index 0428bea..b6e090e 100644
assert_equal File.join(parts), Gem.user_dir
end
@@ -1355,7 +1356,7 @@ def test_self_gzip
@@ -1357,7 +1358,7 @@ def test_self_gzip
def test_self_vendor_dir
expected =
File.join RbConfig::CONFIG['vendordir'], 'gems',