[前][次][番号順一覧][スレッド一覧]

ruby-changes:53003

From: ko1 <ko1@a...>
Date: Sat, 20 Oct 2018 17:00:47 +0900 (JST)
Subject: [ruby-changes:53003] ko1:r65217 (trunk): rename configure option `--disable-mjit` to `--disable-mjit-support`

ko1	2018-10-20 17:00:42 +0900 (Sat, 20 Oct 2018)

  New Revision: 65217

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

  Log:
    rename configure option `--disable-mjit` to `--disable-mjit-support`
    
    * configure.ac: rename configure option `--disable-mjit` to
      `--disable-mjit-support` because `--disable-mjit` is ambiguous that
      runtime MJIT default enable option or supporting MJIT features.
      `ENABLE_MJIT` is also renamed to `MJIT_SUPPORT`
    
    * Makefile.in: catch up this fix.
    
    * common.mk: ditto.
    
    * test/ruby/test_jit.rb: ditto.
    
    * win32/Makefile.sub: catch up this fix on mswin.
    
    * tool/mkconfig.rb: fix to pass `MJIT_SUPPORT` key.

  Modified files:
    trunk/Makefile.in
    trunk/common.mk
    trunk/configure.ac
    trunk/test/ruby/test_jit.rb
    trunk/tool/mkconfig.rb
    trunk/win32/Makefile.sub
Index: tool/mkconfig.rb
===================================================================
--- tool/mkconfig.rb	(revision 65216)
+++ tool/mkconfig.rb	(revision 65217)
@@ -62,6 +62,7 @@ File.foreach "config.status" do |line| https://github.com/ruby/ruby/blob/trunk/tool/mkconfig.rb#L62
     when /^(?:X|(?:MINI|RUN|(?:HAVE_)?BASE|BOOTSTRAP|BTEST)RUBY(?:_COMMAND)?$)/; next
     when /^INSTALLDOC|TARGET$/; next
     when /^DTRACE/; next
+    when /^MJIT_SUPPORT/; # pass
     when /^MJIT_/; next
     when /^(?:MAJOR|MINOR|TEENY)$/; vars[name] = val; next
     when /^LIBRUBY_D?LD/; next
Index: test/ruby/test_jit.rb
===================================================================
--- test/ruby/test_jit.rb	(revision 65216)
+++ test/ruby/test_jit.rb	(revision 65217)
@@ -5,7 +5,7 @@ require_relative '../lib/jit_support' https://github.com/ruby/ruby/blob/trunk/test/ruby/test_jit.rb#L5
 
 require 'rbconfig'
 
-return if RbConfig::CONFIG["ENABLE_MJIT"] == 'no'
+return if RbConfig::CONFIG["MJIT_SUPPORT"] == 'no'
 
 # Test for --jit option
 class TestJIT < Test::Unit::TestCase
Index: configure.ac
===================================================================
--- configure.ac	(revision 65216)
+++ configure.ac	(revision 65217)
@@ -3325,16 +3325,16 @@ AC_SUBST(CAPITARGET) https://github.com/ruby/ruby/blob/trunk/configure.ac#L3325
 AS_CASE(["$RDOCTARGET:$CAPITARGET"],[nodoc:nodoc],[INSTALLDOC=nodoc],[INSTALLDOC=all])
 AC_SUBST(INSTALLDOC)
 
-AC_ARG_ENABLE(mjit,
-        AS_HELP_STRING([--disable-mjit], [disable MJIT features]),
-        [ENABLE_MJIT=$enableval
-         AS_IF([test x"$enable_mjit" = "xyes"],
+AC_ARG_ENABLE(mjit-support,
+        AS_HELP_STRING([--disable-mjit-support], [disable MJIT features]),
+        [MJIT_SUPPORT=$enableval
+         AS_IF([test x"$enable_mjit_support" = "xyes"],
                  [AC_DEFINE(USE_MJIT, 1)],
                  [AC_DEFINE(USE_MJIT, 0)])],
-        [ENABLE_MJIT=yes
+        [MJIT_SUPPORT=yes
          AC_DEFINE(USE_MJIT, 1)])
 
-AC_SUBST(ENABLE_MJIT)
+AC_SUBST(MJIT_SUPPORT)
 
 AC_ARG_ENABLE(install-static-library,
 	AS_HELP_STRING([--disable-install-static-library], [do not install static ruby library]),
@@ -3997,7 +3997,7 @@ config_summary "debugflags"          "$d https://github.com/ruby/ruby/blob/trunk/configure.ac#L3997
 config_summary "warnflags"           "$warnflags"
 config_summary "strip command"       "$STRIP"
 config_summary "install doc"         "$install_doc"
-config_summary "enable MJIT"         "$ENABLE_MJIT"
+config_summary "MJIT support"        "$MJIT_SUPPORT"
 config_summary "man page type"       "$MANTYPE"
 config_summary "search path"         "$search_path"
 config_summary "static-linked-ext"   ${EXTSTATIC:+"yes"}
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 65216)
+++ Makefile.in	(revision 65217)
@@ -76,7 +76,7 @@ XCFLAGS = @XCFLAGS@ $(MATHN:yes=-DCANONI https://github.com/ruby/ruby/blob/trunk/Makefile.in#L76
 USE_RUBYGEMS = @USE_RUBYGEMS@
 USE_RUBYGEMS_ = $(USE_RUBYGEMS:yes=)
 CPPFLAGS = @CPPFLAGS@ $(INCFLAGS) $(USE_RUBYGEMS_:no=-DDISABLE_RUBYGEMS=1)
-ENABLE_MJIT = @ENABLE_MJIT@
+MJIT_SUPPORT = @MJIT_SUPPORT@
 MJIT_HEADER_FLAGS = @MJIT_HEADER_FLAGS@
 MJIT_HEADER_SUFFIX =
 MJIT_HEADER_ARCH =
Index: common.mk
===================================================================
--- common.mk	(revision 65216)
+++ common.mk	(revision 65217)
@@ -201,7 +201,7 @@ all: $(SHOWFLAGS) main docs https://github.com/ruby/ruby/blob/trunk/common.mk#L201
 main: $(SHOWFLAGS) exts $(ENCSTATIC:static=lib)encs
 	@$(NULLCMD)
 
-mjit-headers: $(ENABLE_MJIT)-mjit-headers
+mjit-headers: $(MJIT_SUPPORT)-mjit-headers
 no-mjit-headers: PHONY
 yes-mjit-headers: mjit_config.h PHONY
 
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 65216)
+++ win32/Makefile.sub	(revision 65217)
@@ -302,8 +302,8 @@ CPPFLAGS = $(DEFS) $(ARCHDEFS) $(CPPFLAG https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L302
 !if "$(USE_RUBYGEMS)" == "no"
 CPPFLAGS = -DDISABLE_RUBYGEMS $(CPPFLAGS)
 !endif
-!ifndef INSTALL_MJIT_HEADER
-INSTALL_MJIT_HEADER = yes
+!ifndef MJIT_SUPPORT
+MJIT_SUPPORT = yes
 !endif
 !if "$(CPPOUTFLAG)" == ">"
 MJIT_HEADER_FLAGS =

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

[前][次][番号順一覧][スレッド一覧]