hsbt	2019-03-01 17:31:43 +0900 (Fri, 01 Mar 2019)

  New Revision: 67155

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=67155

  Log:
    Fixed build failure of Travis CI. We need to support `make srcs`.

  Modified files:
    trunk/common.mk
    trunk/ext/ripper/extconf.rb
Index: ext/ripper/extconf.rb
===================================================================
--- ext/ripper/extconf.rb	(revision 67154)
+++ ext/ripper/extconf.rb	(revision 67155)
@@ -5,7 +5,9 @@ require 'mkmf' https://github.com/ruby/ruby/blob/trunk/ext/ripper/extconf.rb#L5
 require 'rbconfig'
 
 def main
-  unless find_executable(ENV["YACC"] || 'bison')
+  yacc = ENV["YACC"] || "bison"
+
+  unless find_executable(yacc)
     unless File.exist?('ripper.c') or File.exist?("#{$srcdir}/ripper.c")
       raise 'missing bison; abort'
     end
@@ -17,7 +19,7 @@ def main https://github.com/ruby/ruby/blob/trunk/ext/ripper/extconf.rb#L19
   $VPATH << '$(topdir)' << '$(top_srcdir)'
   $INCFLAGS << ' -I$(topdir) -I$(top_srcdir)'
   create_makefile 'ripper' do |conf|
-    conf << "BISON = #{ENV['YACC'] || 'bison'}"
+    conf << "BISON = #{yacc}"
   end
 end
 
Index: common.mk
===================================================================
--- common.mk	(revision 67154)
+++ common.mk	(revision 67155)
@@ -1096,7 +1096,7 @@ $(srcdir)/ext/ripper/ripper.c: $(srcdir) https://github.com/ruby/ruby/blob/trunk/common.mk#L1096
 	$(Q) VPATH=$${PWD-`pwd`} && $(CHDIR) $(@D) && \
 	sed -e 's/{\$$([^(){}]*)[^{}]*}//g' -e /AUTOGENERATED/q depend | \
 	$(exec) $(MAKE) -f - $(mflags) \
-		Q=$(Q) ECHO=$(ECHO) RM="$(RM)" top_srcdir=../.. srcdir=. VPATH="$${VPATH}" \
+		Q=$(Q) ECHO=$(ECHO) RM="$(RM)" BISON=$(YACC) top_srcdir=../.. srcdir=. VPATH="$${VPATH}" \
 		RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)"
 
 $(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/