Upgrade to Ruby 2.0.0 (r37773).
This commit is contained in:
parent
b3f2794361
commit
dc03cfc635
@ -29,7 +29,7 @@ diff --git a/configure.in b/configure.in
|
||||
index 8e4aaec..c65e0c7 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -3169,6 +3169,15 @@ until SITE_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${SITE_DIR}"; do
|
||||
@@ -3153,6 +3153,15 @@ until SITE_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${SITE_DIR}"; do
|
||||
dir="${SITE_DIR}"
|
||||
done
|
||||
|
||||
@ -45,7 +45,7 @@ index 8e4aaec..c65e0c7 100644
|
||||
AC_ARG_WITH(vendordir,
|
||||
AS_HELP_STRING([--with-vendordir=DIR], [vendor libraries in DIR [[RUBY_LIB_PREFIX/vendor_ruby]], "no" to disable vendor directory]),
|
||||
[vendordir=$withval],
|
||||
@@ -3178,19 +3187,32 @@ until VENDOR_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${VENDOR_DIR}"; do
|
||||
@@ -3162,19 +3171,32 @@ until VENDOR_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${VENDOR_DIR}"; do
|
||||
dir="${VENDOR_DIR}"
|
||||
done
|
||||
|
||||
@ -78,7 +78,7 @@ index 8e4aaec..c65e0c7 100644
|
||||
fi
|
||||
|
||||
pat=`echo "$RUBY_LIB_PREFIX/" | tr -c '\012' .`'\(.*\)'
|
||||
@@ -3208,6 +3230,13 @@ AS_CASE(["$RUBY_SITE_LIB_PATH"],
|
||||
@@ -3192,6 +3214,13 @@ AS_CASE(["$RUBY_SITE_LIB_PATH"],
|
||||
[
|
||||
RUBY_SITE_LIB_PATH="\"${RUBY_SITE_LIB_PATH}\""
|
||||
])
|
||||
@ -92,7 +92,7 @@ index 8e4aaec..c65e0c7 100644
|
||||
AS_CASE(["$RUBY_VENDOR_LIB_PATH"],
|
||||
["$RUBY_LIB_PREFIX/"*], [
|
||||
RUBY_VENDOR_LIB_PATH='RUBY_LIB_PREFIX"/'"`expr \"$RUBY_VENDOR_LIB_PATH\" : \"$pat\"`"'"'
|
||||
@@ -3215,6 +3244,13 @@ AS_CASE(["$RUBY_VENDOR_LIB_PATH"],
|
||||
@@ -3199,6 +3228,13 @@ AS_CASE(["$RUBY_VENDOR_LIB_PATH"],
|
||||
[
|
||||
RUBY_VENDOR_LIB_PATH="\"${RUBY_VENDOR_LIB_PATH}\""
|
||||
])
|
||||
@ -106,7 +106,7 @@ index 8e4aaec..c65e0c7 100644
|
||||
pat=`echo "$RUBY_EXEC_PREFIX/" | tr -c '\012' .`'\(.*\)'
|
||||
AS_CASE(["$RUBY_LIB_PREFIX"],
|
||||
["$RUBY_EXEC_PREFIX/"*], [
|
||||
@@ -3236,11 +3272,13 @@ if test "x$SITE_DIR" = xno; then
|
||||
@@ -3220,11 +3256,13 @@ if test "x$SITE_DIR" = xno; then
|
||||
AC_DEFINE(NO_RUBY_SITE_LIB, [] !<verconf>!)
|
||||
else
|
||||
AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, ${RUBY_SITE_LIB_PATH} !<verconf>!)
|
||||
@ -120,7 +120,7 @@ index 8e4aaec..c65e0c7 100644
|
||||
fi
|
||||
|
||||
AC_SUBST(arch)dnl
|
||||
@@ -3248,7 +3286,9 @@ AC_SUBST(sitearch)dnl
|
||||
@@ -3232,7 +3270,9 @@ AC_SUBST(sitearch)dnl
|
||||
AC_SUBST(ruby_version)dnl
|
||||
AC_SUBST(archdir)dnl
|
||||
AC_SUBST(sitedir)dnl
|
||||
|
@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in
|
||||
index c65e0c7..748edc9 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -3293,6 +3293,8 @@ AC_SUBST(vendorarchdir)dnl
|
||||
@@ -3277,6 +3277,8 @@ AC_SUBST(vendorarchdir)dnl
|
||||
configure_args=$ac_configure_args
|
||||
AC_SUBST(configure_args)dnl
|
||||
|
||||
|
@ -26,7 +26,7 @@ diff --git a/configure.in b/configure.in
|
||||
index db3641b..8e4aaec 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -3151,6 +3151,15 @@ else
|
||||
@@ -3135,6 +3135,15 @@ else
|
||||
RUBY_LIB_VERSION="\"${ruby_version}\""
|
||||
fi
|
||||
|
||||
@ -42,7 +42,7 @@ index db3641b..8e4aaec 100644
|
||||
AC_ARG_WITH(sitedir,
|
||||
AS_HELP_STRING([--with-sitedir=DIR], [site libraries in DIR [[RUBY_LIB_PREFIX/site_ruby]], "no" to disable site directory]),
|
||||
[sitedir=$withval],
|
||||
@@ -3173,16 +3182,25 @@ if test "${LOAD_RELATIVE+set}"; then
|
||||
@@ -3157,16 +3166,25 @@ if test "${LOAD_RELATIVE+set}"; then
|
||||
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
|
||||
RUBY_EXEC_PREFIX=""
|
||||
RUBY_LIB_PREFIX="`eval echo "$RUBY_LIB_PREFIX" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
|
||||
@ -68,7 +68,7 @@ index db3641b..8e4aaec 100644
|
||||
AS_CASE(["$RUBY_SITE_LIB_PATH"],
|
||||
["$RUBY_LIB_PREFIX/"*], [
|
||||
RUBY_SITE_LIB_PATH='RUBY_LIB_PREFIX"/'"`expr \"$RUBY_SITE_LIB_PATH\" : \"$pat\"`"'"'
|
||||
@@ -3213,6 +3231,7 @@ else
|
||||
@@ -3197,6 +3215,7 @@ else
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED(RUBY_EXEC_PREFIX, "${RUBY_EXEC_PREFIX}")
|
||||
AC_DEFINE_UNQUOTED(RUBY_LIB_PREFIX, ${RUBY_LIB_PREFIX} !<verconf>!)
|
||||
@ -76,7 +76,7 @@ index db3641b..8e4aaec 100644
|
||||
if test "x$SITE_DIR" = xno; then
|
||||
AC_DEFINE(NO_RUBY_SITE_LIB, [] !<verconf>!)
|
||||
else
|
||||
@@ -3227,6 +3246,7 @@ fi
|
||||
@@ -3211,6 +3230,7 @@ fi
|
||||
AC_SUBST(arch)dnl
|
||||
AC_SUBST(sitearch)dnl
|
||||
AC_SUBST(ruby_version)dnl
|
||||
|
@ -15,7 +15,7 @@ diff --git a/configure.in b/configure.in
|
||||
index 748edc9..6a16745 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -3196,6 +3196,13 @@ until VENDORARCH_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${VENDORARCH_D
|
||||
@@ -3180,6 +3180,13 @@ until VENDORARCH_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${VENDORARCH_D
|
||||
dir="${VENDORARCH_DIR}"
|
||||
done
|
||||
|
||||
@ -29,7 +29,7 @@ index 748edc9..6a16745 100644
|
||||
if test "${LOAD_RELATIVE+set}"; then
|
||||
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
|
||||
RUBY_EXEC_PREFIX=""
|
||||
@@ -3289,6 +3296,7 @@ AC_SUBST(sitedir)dnl
|
||||
@@ -3273,6 +3280,7 @@ AC_SUBST(sitedir)dnl
|
||||
AC_SUBST(sitearchdir)dnl
|
||||
AC_SUBST(vendordir)dnl
|
||||
AC_SUBST(vendorarchdir)dnl
|
||||
|
@ -15,7 +15,7 @@ diff --git a/configure.in b/configure.in
|
||||
index f2d22ef..db3641b 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -3318,6 +3318,17 @@ else
|
||||
@@ -3302,6 +3302,17 @@ else
|
||||
fi
|
||||
AC_SUBST(USE_RUBYGEMS)
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
#%%global milestone preview1
|
||||
|
||||
# Keep the revision enabled for pre-releases from SVN.
|
||||
%global revision 37589
|
||||
%global revision 37773
|
||||
|
||||
%global ruby_archive %{name}-%{ruby_version}
|
||||
|
||||
@ -57,7 +57,7 @@
|
||||
# http://rpm.org/ticket/78
|
||||
%global gem_extdir %{_exec_prefix}/lib{,64}/gems
|
||||
|
||||
%global rake_version 0.9.2.2
|
||||
%global rake_version 0.9.4
|
||||
# TODO: The IRB has strange versioning. Keep the Ruby's versioning ATM.
|
||||
# http://redmine.ruby-lang.org/issues/5313
|
||||
%global irb_version %{ruby_version_patch_level}
|
||||
@ -522,9 +522,8 @@ sed -i '8 a\
|
||||
s.require_paths = ["lib"]' %{buildroot}%{gem_dir}/specifications/minitest-%{minitest_version}.gemspec
|
||||
|
||||
%check
|
||||
# http://bugs.ruby-lang.org/issues/7298
|
||||
# http://bugs.ruby-lang.org/issues/7312
|
||||
DISABLE_TESTS="-x test_enumerator.rb -x test_m17n_comb.rb"
|
||||
# https://bugs.ruby-lang.org/issues/7386
|
||||
DISABLE_TESTS="-x test_rake_functional.rb"
|
||||
|
||||
%ifarch armv7l armv7hl armv7hnl
|
||||
# test_call_double(DL::TestDL) fails on ARM HardFP
|
||||
|
Loading…
Reference in New Issue
Block a user