Upgrade to Ruby 2.4.0 (r56436).
This commit is contained in:
parent
d925e62908
commit
8ebe544798
6 changed files with 15 additions and 15 deletions
|
|
@ -20,7 +20,7 @@ diff --git a/configure.in b/configure.in
|
|||
index db37cd6..6e73fae 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -4307,9 +4307,6 @@ AS_CASE(["$target_os"],
|
||||
@@ -4315,9 +4315,6 @@ AS_CASE(["$target_os"],
|
||||
rubyw_install_name='$(RUBYW_INSTALL_NAME)'
|
||||
])
|
||||
|
||||
|
|
@ -30,7 +30,7 @@ index db37cd6..6e73fae 100644
|
|||
rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
|
||||
AC_ARG_WITH(rubyarchprefix,
|
||||
AS_HELP_STRING([--with-rubyarchprefix=DIR],
|
||||
@@ -4332,56 +4329,62 @@ AC_ARG_WITH(ridir,
|
||||
@@ -4340,56 +4337,62 @@ AC_ARG_WITH(ridir,
|
||||
AC_SUBST(ridir)
|
||||
AC_SUBST(RI_BASE_NAME)
|
||||
|
||||
|
|
@ -120,7 +120,7 @@ index db37cd6..6e73fae 100644
|
|||
|
||||
if test "${LOAD_RELATIVE+set}"; then
|
||||
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
|
||||
@@ -4398,6 +4401,7 @@ AC_SUBST(sitearchincludedir)dnl
|
||||
@@ -4406,6 +4409,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
|
||||
@@ -1098,7 +1098,8 @@ def test_self_use_paths
|
||||
@@ -1101,7 +1101,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
|
||||
@@ -1225,7 +1226,7 @@ def test_self_user_home_user_drive_and_path
|
||||
@@ -1228,7 +1229,7 @@ def test_self_user_home_user_drive_and_path
|
||||
def test_self_vendor_dir
|
||||
expected =
|
||||
File.join RbConfig::CONFIG['vendordir'], 'gems',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue