lang/ruby/patches/001-acinclude.m4_rename_aclocal.m4.patch

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