Browse Source
Merge pull request #2461 from luizluca/ruby-2.3.0
ruby: bump to 2.3.0lilik-openwrt-22.03
Luiz Angelo Daros de Luca
9 years ago
3 changed files with 203 additions and 48 deletions
Split View
Diff Options
-
+51 -12lang/ruby/Makefile
-
+152 -0lang/ruby/patches/001-acinclude.m4_rename_aclocal.m4.patch
-
+0 -36lang/ruby/patches/001-rdoc-remove_gems_dep.patch
+ 51
- 12
lang/ruby/Makefile
View File
+ 152
- 0
lang/ruby/patches/001-acinclude.m4_rename_aclocal.m4.patch
View File
| @ -0,0 +1,152 @@ | |||
| https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/53414 | |||
| Fixes: | |||
| https://bugs.ruby-lang.org/issues/11941 | |||
| It might be incorporated in the following release | |||
| Index: aclocal.m4 | |||
| =================================================================== | |||
| --- a/aclocal.m4 (revision 53413) | |||
| +++ b/aclocal.m4 (revision 53414) | |||
| @@ -1,46 +0,0 @@ | |||
| -# -*- autoconf -*- | |||
| - | |||
| -AC_DEFUN([_COLORIZE_RESULT_PREPARE], [ | |||
| - msg_checking= msg_result_yes= msg_result_no= msg_result_other= msg_reset= | |||
| - AS_IF([test "x${CONFIGURE_TTY}" = xyes -o -t 1], [ | |||
| - msg_begin="`tput smso 2>/dev/null`" | |||
| - AS_CASE(["$msg_begin"], ['@<:@'*m], | |||
| - [msg_begin="`echo "$msg_begin" | sed ['s/[0-9]*m$//']`" | |||
| - msg_checking="${msg_begin}33m" | |||
| - AS_IF([test ${TEST_COLORS:+set}], [ | |||
| - msg_result_yes=[`expr ":$TEST_COLORS:" : ".*:pass=\([^:]*\):"`] | |||
| - msg_result_no=[`expr ":$TEST_COLORS:" : ".*:fail=\([^:]*\):"`] | |||
| - msg_result_other=[`expr ":$TEST_COLORS:" : ".*:skip=\([^:]*\):"`] | |||
| - ]) | |||
| - msg_result_yes="${msg_begin}${msg_result_yes:-32;1}m" | |||
| - msg_result_no="${msg_begin}${msg_result_no:-31;1}m" | |||
| - msg_result_other="${msg_begin}${msg_result_other:-33;1}m" | |||
| - msg_reset="${msg_begin}m" | |||
| - ]) | |||
| - AS_UNSET(msg_begin) | |||
| - ]) | |||
| - AS_REQUIRE_SHELL_FN([colorize_result], | |||
| - [AS_FUNCTION_DESCRIBE([colorize_result], [MSG], [Colorize result])], | |||
| - [AS_CASE(["$[]1"], | |||
| - [yes], [AS_ECHO(["${msg_result_yes}$[]1${msg_reset}]")], | |||
| - [no], [AS_ECHO(["${msg_result_no}$[]1${msg_reset}]")], | |||
| - [AS_ECHO(["${msg_result_other}$[]1${msg_reset}]")])]) | |||
| -]) | |||
| - | |||
| -AC_DEFUN([COLORIZE_RESULT], [AC_REQUIRE([_COLORIZE_RESULT_PREPARE])dnl | |||
| - AS_LITERAL_IF([$1], | |||
| - [m4_case([$1], | |||
| - [yes], [AS_ECHO(["${msg_result_yes}$1${msg_reset}"])], | |||
| - [no], [AS_ECHO(["${msg_result_no}$1${msg_reset}"])], | |||
| - [AS_ECHO(["${msg_result_other}$1${msg_reset}"])])], | |||
| - [colorize_result "$1"]) dnl | |||
| -]) | |||
| - | |||
| -AC_DEFUN([AC_CHECKING],[dnl | |||
| -AC_REQUIRE([_COLORIZE_RESULT_PREPARE])dnl | |||
| -AS_MESSAGE([checking ${msg_checking}$1${msg_reset}...])]) | |||
| - | |||
| -AC_DEFUN([AC_MSG_RESULT], [dnl | |||
| -{ _AS_ECHO_LOG([result: $1]) | |||
| -COLORIZE_RESULT([$1]); dnl | |||
| -}]) | |||
| Index: acinclude.m4 | |||
| =================================================================== | |||
| --- a/acinclude.m4 (revision 0) | |||
| +++ b/acinclude.m4 (revision 53414) | |||
| @@ -0,0 +1,46 @@ | |||
| +# -*- autoconf -*- | |||
| + | |||
| +AC_DEFUN([_COLORIZE_RESULT_PREPARE], [ | |||
| + msg_checking= msg_result_yes= msg_result_no= msg_result_other= msg_reset= | |||
| + AS_IF([test "x${CONFIGURE_TTY}" = xyes -o -t 1], [ | |||
| + msg_begin="`tput smso 2>/dev/null`" | |||
| + AS_CASE(["$msg_begin"], ['@<:@'*m], | |||
| + [msg_begin="`echo "$msg_begin" | sed ['s/[0-9]*m$//']`" | |||
| + msg_checking="${msg_begin}33m" | |||
| + AS_IF([test ${TEST_COLORS:+set}], [ | |||
| + msg_result_yes=[`expr ":$TEST_COLORS:" : ".*:pass=\([^:]*\):"`] | |||
| + msg_result_no=[`expr ":$TEST_COLORS:" : ".*:fail=\([^:]*\):"`] | |||
| + msg_result_other=[`expr ":$TEST_COLORS:" : ".*:skip=\([^:]*\):"`] | |||
| + ]) | |||
| + msg_result_yes="${msg_begin}${msg_result_yes:-32;1}m" | |||
| + msg_result_no="${msg_begin}${msg_result_no:-31;1}m" | |||
| + msg_result_other="${msg_begin}${msg_result_other:-33;1}m" | |||
| + msg_reset="${msg_begin}m" | |||
| + ]) | |||
| + AS_UNSET(msg_begin) | |||
| + ]) | |||
| + AS_REQUIRE_SHELL_FN([colorize_result], | |||
| + [AS_FUNCTION_DESCRIBE([colorize_result], [MSG], [Colorize result])], | |||
| + [AS_CASE(["$[]1"], | |||
| + [yes], [AS_ECHO(["${msg_result_yes}$[]1${msg_reset}]")], | |||
| + [no], [AS_ECHO(["${msg_result_no}$[]1${msg_reset}]")], | |||
| + [AS_ECHO(["${msg_result_other}$[]1${msg_reset}]")])]) | |||
| +]) | |||
| + | |||
| +AC_DEFUN([COLORIZE_RESULT], [AC_REQUIRE([_COLORIZE_RESULT_PREPARE])dnl | |||
| + AS_LITERAL_IF([$1], | |||
| + [m4_case([$1], | |||
| + [yes], [AS_ECHO(["${msg_result_yes}$1${msg_reset}"])], | |||
| + [no], [AS_ECHO(["${msg_result_no}$1${msg_reset}"])], | |||
| + [AS_ECHO(["${msg_result_other}$1${msg_reset}"])])], | |||
| + [colorize_result "$1"]) dnl | |||
| +]) | |||
| + | |||
| +AC_DEFUN([AC_CHECKING],[dnl | |||
| +AC_REQUIRE([_COLORIZE_RESULT_PREPARE])dnl | |||
| +AS_MESSAGE([checking ${msg_checking}$1${msg_reset}...])]) | |||
| + | |||
| +AC_DEFUN([AC_MSG_RESULT], [dnl | |||
| +{ _AS_ECHO_LOG([result: $1]) | |||
| +COLORIZE_RESULT([$1]); dnl | |||
| +}]) | |||
| Property changes on: acinclude.m4 | |||
| ___________________________________________________________________ | |||
| Added: svn:eol-style | |||
| ## -0,0 +1 ## | |||
| +LF | |||
| \ No newline at end of property | |||
| Index: common.mk | |||
| =================================================================== | |||
| --- a/common.mk (revision 53413) | |||
| +++ b/common.mk (revision 53414) | |||
| @@ -518,7 +518,7 @@ | |||
| $(Q)$(RM) id.c id.h probes.dmyh | |||
| $(Q)$(CHDIR) $(srcdir) && $(exec) $(RM) parse.c parse.h lex.c enc/trans/newline.c $(PRELUDES) revision.h | |||
| $(Q)$(CHDIR) $(srcdir) && $(exec) $(RM) id.c id.h probes.dmyh | |||
| - $(Q)$(CHDIR) $(srcdir) && $(exec) $(RM) configure tool/config.guess tool/config.sub gems/*.gem | |||
| + $(Q)$(CHDIR) $(srcdir) && $(exec) $(RM) configure aclocal.m4 tool/config.guess tool/config.sub gems/*.gem | |||
| realclean-ext:: PHONY | |||
| realclean-golf: distclean-golf | |||
| $(Q)$(RM) $(GOLFPRELUDES) | |||
| Index: Makefile.in | |||
| =================================================================== | |||
| --- a/Makefile.in (revision 53413) | |||
| +++ b/Makefile.in (revision 53414) | |||
| @@ -22,6 +22,7 @@ | |||
| YACC = bison | |||
| PURIFY = | |||
| AUTOCONF = autoconf | |||
| +ACLOCAL = aclocal | |||
| CONFIGURE = @CONFIGURE@ | |||
| @SET_MAKE@ | |||
| MKFILES = @MAKEFILES@ | |||
| @@ -310,6 +311,9 @@ | |||
| $(srcdir)/$(CONFIGURE): $(srcdir)/configure.in $(srcdir)/aclocal.m4 | |||
| $(CHDIR) $(srcdir) && exec $(AUTOCONF) -o $(@F) | |||
| +$(srcdir)/aclocal.m4: $(srcdir)/acinclude.m4 | |||
| + $(CHDIR) $(srcdir) && exec $(ACLOCAL) | |||
| + | |||
| incs: id.h | |||
| all-incs: probes.h | |||
+ 0
- 36
lang/ruby/patches/001-rdoc-remove_gems_dep.patch
View File
| @ -1,36 +0,0 @@ | |||
| References: | |||
| https://github.com/rdoc/rdoc/pull/340 | |||
| --- ruby-2.1.2.orig/lib/rdoc.rb 2014-09-02 17:14:28.719224215 -0300 | |||
| +++ ruby-2.1.2/lib/rdoc.rb 2014-09-02 17:14:28.762223911 -0300 | |||
| @@ -109,6 +109,8 @@ | |||
| def self.load_yaml | |||
| begin | |||
| gem 'psych' | |||
| + rescue NameError => e # --disable-gems | |||
| + raise unless e.name == :gem | |||
| rescue Gem::LoadError | |||
| end | |||
| --- ruby-2.1.2.orig/lib/rdoc/markdown.rb 2014-09-02 17:14:28.761223918 -0300 | |||
| +++ ruby-2.1.2/lib/rdoc/markdown.rb 2014-09-02 17:14:28.805223607 -0300 | |||
| @@ -525,7 +525,6 @@ | |||
| - require 'rubygems' | |||
| require 'rdoc' | |||
| require 'rdoc/markup/to_joined_paragraph' | |||
| require 'rdoc/markdown/entities' | |||
| --- ruby-2.1.2.orig/lib/rdoc/text.rb 2014-09-02 17:14:28.721224201 -0300 | |||
| +++ ruby-2.1.2/lib/rdoc/text.rb 2014-09-02 17:14:28.764223897 -0300 | |||
| @@ -10,6 +10,8 @@ | |||
| begin | |||
| gem 'json' | |||
| +rescue NameError => e # --disable-gems | |||
| + raise unless e.name == :gem | |||
| rescue Gem::LoadError | |||
| end | |||