You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

152 lines
5.3 KiB

  1. https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/53414
  2. Fixes:
  3. https://bugs.ruby-lang.org/issues/11941
  4. It might be incorporated in the following release
  5. Index: aclocal.m4
  6. ===================================================================
  7. --- a/aclocal.m4 (revision 53413)
  8. +++ b/aclocal.m4 (revision 53414)
  9. @@ -1,46 +0,0 @@
  10. -# -*- autoconf -*-
  11. -
  12. -AC_DEFUN([_COLORIZE_RESULT_PREPARE], [
  13. - msg_checking= msg_result_yes= msg_result_no= msg_result_other= msg_reset=
  14. - AS_IF([test "x${CONFIGURE_TTY}" = xyes -o -t 1], [
  15. - msg_begin="`tput smso 2>/dev/null`"
  16. - AS_CASE(["$msg_begin"], ['@<:@'*m],
  17. - [msg_begin="`echo "$msg_begin" | sed ['s/[0-9]*m$//']`"
  18. - msg_checking="${msg_begin}33m"
  19. - AS_IF([test ${TEST_COLORS:+set}], [
  20. - msg_result_yes=[`expr ":$TEST_COLORS:" : ".*:pass=\([^:]*\):"`]
  21. - msg_result_no=[`expr ":$TEST_COLORS:" : ".*:fail=\([^:]*\):"`]
  22. - msg_result_other=[`expr ":$TEST_COLORS:" : ".*:skip=\([^:]*\):"`]
  23. - ])
  24. - msg_result_yes="${msg_begin}${msg_result_yes:-32;1}m"
  25. - msg_result_no="${msg_begin}${msg_result_no:-31;1}m"
  26. - msg_result_other="${msg_begin}${msg_result_other:-33;1}m"
  27. - msg_reset="${msg_begin}m"
  28. - ])
  29. - AS_UNSET(msg_begin)
  30. - ])
  31. - AS_REQUIRE_SHELL_FN([colorize_result],
  32. - [AS_FUNCTION_DESCRIBE([colorize_result], [MSG], [Colorize result])],
  33. - [AS_CASE(["$[]1"],
  34. - [yes], [AS_ECHO(["${msg_result_yes}$[]1${msg_reset}]")],
  35. - [no], [AS_ECHO(["${msg_result_no}$[]1${msg_reset}]")],
  36. - [AS_ECHO(["${msg_result_other}$[]1${msg_reset}]")])])
  37. -])
  38. -
  39. -AC_DEFUN([COLORIZE_RESULT], [AC_REQUIRE([_COLORIZE_RESULT_PREPARE])dnl
  40. - AS_LITERAL_IF([$1],
  41. - [m4_case([$1],
  42. - [yes], [AS_ECHO(["${msg_result_yes}$1${msg_reset}"])],
  43. - [no], [AS_ECHO(["${msg_result_no}$1${msg_reset}"])],
  44. - [AS_ECHO(["${msg_result_other}$1${msg_reset}"])])],
  45. - [colorize_result "$1"]) dnl
  46. -])
  47. -
  48. -AC_DEFUN([AC_CHECKING],[dnl
  49. -AC_REQUIRE([_COLORIZE_RESULT_PREPARE])dnl
  50. -AS_MESSAGE([checking ${msg_checking}$1${msg_reset}...])])
  51. -
  52. -AC_DEFUN([AC_MSG_RESULT], [dnl
  53. -{ _AS_ECHO_LOG([result: $1])
  54. -COLORIZE_RESULT([$1]); dnl
  55. -}])
  56. Index: acinclude.m4
  57. ===================================================================
  58. --- a/acinclude.m4 (revision 0)
  59. +++ b/acinclude.m4 (revision 53414)
  60. @@ -0,0 +1,46 @@
  61. +# -*- autoconf -*-
  62. +
  63. +AC_DEFUN([_COLORIZE_RESULT_PREPARE], [
  64. + msg_checking= msg_result_yes= msg_result_no= msg_result_other= msg_reset=
  65. + AS_IF([test "x${CONFIGURE_TTY}" = xyes -o -t 1], [
  66. + msg_begin="`tput smso 2>/dev/null`"
  67. + AS_CASE(["$msg_begin"], ['@<:@'*m],
  68. + [msg_begin="`echo "$msg_begin" | sed ['s/[0-9]*m$//']`"
  69. + msg_checking="${msg_begin}33m"
  70. + AS_IF([test ${TEST_COLORS:+set}], [
  71. + msg_result_yes=[`expr ":$TEST_COLORS:" : ".*:pass=\([^:]*\):"`]
  72. + msg_result_no=[`expr ":$TEST_COLORS:" : ".*:fail=\([^:]*\):"`]
  73. + msg_result_other=[`expr ":$TEST_COLORS:" : ".*:skip=\([^:]*\):"`]
  74. + ])
  75. + msg_result_yes="${msg_begin}${msg_result_yes:-32;1}m"
  76. + msg_result_no="${msg_begin}${msg_result_no:-31;1}m"
  77. + msg_result_other="${msg_begin}${msg_result_other:-33;1}m"
  78. + msg_reset="${msg_begin}m"
  79. + ])
  80. + AS_UNSET(msg_begin)
  81. + ])
  82. + AS_REQUIRE_SHELL_FN([colorize_result],
  83. + [AS_FUNCTION_DESCRIBE([colorize_result], [MSG], [Colorize result])],
  84. + [AS_CASE(["$[]1"],
  85. + [yes], [AS_ECHO(["${msg_result_yes}$[]1${msg_reset}]")],
  86. + [no], [AS_ECHO(["${msg_result_no}$[]1${msg_reset}]")],
  87. + [AS_ECHO(["${msg_result_other}$[]1${msg_reset}]")])])
  88. +])
  89. +
  90. +AC_DEFUN([COLORIZE_RESULT], [AC_REQUIRE([_COLORIZE_RESULT_PREPARE])dnl
  91. + AS_LITERAL_IF([$1],
  92. + [m4_case([$1],
  93. + [yes], [AS_ECHO(["${msg_result_yes}$1${msg_reset}"])],
  94. + [no], [AS_ECHO(["${msg_result_no}$1${msg_reset}"])],
  95. + [AS_ECHO(["${msg_result_other}$1${msg_reset}"])])],
  96. + [colorize_result "$1"]) dnl
  97. +])
  98. +
  99. +AC_DEFUN([AC_CHECKING],[dnl
  100. +AC_REQUIRE([_COLORIZE_RESULT_PREPARE])dnl
  101. +AS_MESSAGE([checking ${msg_checking}$1${msg_reset}...])])
  102. +
  103. +AC_DEFUN([AC_MSG_RESULT], [dnl
  104. +{ _AS_ECHO_LOG([result: $1])
  105. +COLORIZE_RESULT([$1]); dnl
  106. +}])
  107. Property changes on: acinclude.m4
  108. ___________________________________________________________________
  109. Added: svn:eol-style
  110. ## -0,0 +1 ##
  111. +LF
  112. \ No newline at end of property
  113. Index: common.mk
  114. ===================================================================
  115. --- a/common.mk (revision 53413)
  116. +++ b/common.mk (revision 53414)
  117. @@ -518,7 +518,7 @@
  118. $(Q)$(RM) id.c id.h probes.dmyh
  119. $(Q)$(CHDIR) $(srcdir) && $(exec) $(RM) parse.c parse.h lex.c enc/trans/newline.c $(PRELUDES) revision.h
  120. $(Q)$(CHDIR) $(srcdir) && $(exec) $(RM) id.c id.h probes.dmyh
  121. - $(Q)$(CHDIR) $(srcdir) && $(exec) $(RM) configure tool/config.guess tool/config.sub gems/*.gem
  122. + $(Q)$(CHDIR) $(srcdir) && $(exec) $(RM) configure aclocal.m4 tool/config.guess tool/config.sub gems/*.gem
  123. realclean-ext:: PHONY
  124. realclean-golf: distclean-golf
  125. $(Q)$(RM) $(GOLFPRELUDES)
  126. Index: Makefile.in
  127. ===================================================================
  128. --- a/Makefile.in (revision 53413)
  129. +++ b/Makefile.in (revision 53414)
  130. @@ -22,6 +22,7 @@
  131. YACC = bison
  132. PURIFY =
  133. AUTOCONF = autoconf
  134. +ACLOCAL = aclocal
  135. CONFIGURE = @CONFIGURE@
  136. @SET_MAKE@
  137. MKFILES = @MAKEFILES@
  138. @@ -310,6 +311,9 @@
  139. $(srcdir)/$(CONFIGURE): $(srcdir)/configure.in $(srcdir)/aclocal.m4
  140. $(CHDIR) $(srcdir) && exec $(AUTOCONF) -o $(@F)
  141. +$(srcdir)/aclocal.m4: $(srcdir)/acinclude.m4
  142. + $(CHDIR) $(srcdir) && exec $(ACLOCAL)
  143. +
  144. incs: id.h
  145. all-incs: probes.h