ruby: bump to 2.6.1

See: https://www.ruby-lang.org/en/news/2019/01/30/ruby-2-6-1-released/
See: https://www.ruby-lang.org/en/news/2018/12/25/ruby-2-6-0-released/

New packages mirroring upstream gemification of ruby:
* ruby-bundler (new)
* ruby-e2mmap and ruby-ostruct (from ruby-misc)
* ruby-forwardable (from ruby-patterns)
* ruby-matrix and ruby-prime (from removed ruby-math)
* ruby-mutex_m, ruby-sync and ruby-thwait (from ruby-multithread)
* ruby-tracer (from ruby-debuglib)

Added ruby-dev for building extension inside openwrt (requires cc)

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
This commit is contained in:
Luiz Angelo Daros de Luca
2019-01-04 02:10:19 -02:00
parent 9d931ca29c
commit 0265390c92
4 changed files with 133 additions and 60 deletions
@@ -1,5 +1,3 @@
Backported to 2.5.3
From 74f94b3e6ebf15b76f3b357e754095412b006e94 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 8 Feb 2019 07:22:55 +0000
@@ -15,9 +13,19 @@ git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67036 b2dd03c8-39d4-4d8f-98ff-
3 files changed, 18 insertions(+), 9 deletions(-)
create mode 100644 tool/m4/ruby_replace_funcs.m4
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -35,6 +35,7 @@ m4_include([tool/m4/ruby_func_attribute.
m4_include([tool/m4/ruby_mingw32.m4])
m4_include([tool/m4/ruby_prepend_option.m4])
m4_include([tool/m4/ruby_prog_gnu_ld.m4])
+m4_include([tool/m4/ruby_replace_funcs.m4])
m4_include([tool/m4/ruby_replace_type.m4])
m4_include([tool/m4/ruby_rm_recursive.m4])
m4_include([tool/m4/ruby_setjmp_type.m4])
--- a/configure.ac
+++ b/configure.ac
@@ -1189,9 +1189,6 @@ main()
@@ -946,9 +946,6 @@ main()
ac_cv_func_fsync=yes
ac_cv_func_seekdir=yes
ac_cv_func_telldir=yes
@@ -27,7 +35,7 @@ git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67036 b2dd03c8-39d4-4d8f-98ff-
ac_cv_func_lchown=yes
ac_cv_func_link=yes
ac_cv_func_readlink=yes
@@ -1239,9 +1236,6 @@ main()
@@ -999,9 +996,6 @@ main()
[netbsd*], [ LIBS="-lm $LIBS"
],
[dragonfly*], [ LIBS="-lm $LIBS"
@@ -37,7 +45,7 @@ git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67036 b2dd03c8-39d4-4d8f-98ff-
],
[aix*],[ LIBS="-lm $LIBS"
ac_cv_func_round=no
@@ -2212,11 +2206,8 @@ AC_REPLACE_FUNCS(dup2)
@@ -1724,11 +1718,8 @@ AC_REPLACE_FUNCS(dup2)
AC_REPLACE_FUNCS(erf)
AC_REPLACE_FUNCS(explicit_bzero)
AC_REPLACE_FUNCS(ffs)
@@ -48,8 +56,8 @@ git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67036 b2dd03c8-39d4-4d8f-98ff-
-AC_REPLACE_FUNCS(isnan)
AC_REPLACE_FUNCS(lgamma_r)
AC_REPLACE_FUNCS(memmove)
AC_REPLACE_FUNCS(nextafter)
@@ -2228,6 +2219,10 @@ AC_REPLACE_FUNCS(strlcpy)
AC_REPLACE_FUNCS(nan)
@@ -1741,6 +1732,10 @@ AC_REPLACE_FUNCS(strlcpy)
AC_REPLACE_FUNCS(strstr)
AC_REPLACE_FUNCS(tgamma)
@@ -76,23 +84,3 @@ git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67036 b2dd03c8-39d4-4d8f-98ff-
+AC_DEFUN([RUBY_REPLACE_FUNCS] [dnl
+ m4_map_args_w([$1], [RUBY_REPLACE_FUNC(], [), [$2]])dnl
+])
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -44,3 +44,17 @@ AC_DEFUN([AC_MSG_RESULT], [dnl
{ _AS_ECHO_LOG([result: $1])
COLORIZE_RESULT([$1]); dnl
}])
+
+# -*- Autoconf -*-
+dnl RUBY_REPLACE_FUNC [func] [included]
+AC_DEFUN([RUBY_REPLACE_FUNC], [dnl
+ AC_CHECK_DECL([$1],dnl
+ [AC_DEFINE(AS_TR_CPP(HAVE_[$1]))],dnl
+ [AC_REPLACE_FUNCS($1)],dnl
+ [$2])dnl
+])
+
+dnl RUBY_REPLACE_FUNCS [funcs] [included]
+AC_DEFUN([RUBY_REPLACE_FUNCS] [dnl
+ m4_map_args_w([$1], [RUBY_REPLACE_FUNC(], [), [$2]])dnl
+])