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

ruby-changes:74162

From: nagachika <ko1@a...>
Date: Fri, 21 Oct 2022 14:02:58 +0900 (JST)
Subject: [ruby-changes:74162] ac0c771d03 (ruby_3_1): merge revision(s) 019cbded90ade76fdb87d02bd4d444724429fc92:

https://git.ruby-lang.org/ruby.git/commit/?id=ac0c771d03

From ac0c771d03573a4e99aff033599cb9f050fea4ff Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Fri, 21 Oct 2022 13:41:35 +0900
Subject: merge revision(s) 019cbded90ade76fdb87d02bd4d444724429fc92:

	mkmf: Add a configure option to set verbose mode (V=1 or 0) in
	 mkmf.rb.

	Note this change is only for `configure.ac`, not for Windows using
	`win32/configure.bat`.

	```
	$ ./configure --help | grep mkmf
	  --enable-mkmf-verbose   enable verbose in mkmf
	```

	Run the following command to enable the mkmf verbose mode.

	```
	$ ./configure --enable-mkmf-verbose
	$ grep MKMF_VERBOSE config.status
	S["MKMF_VERBOSE"]="1"
	```

	In this mkmf verbose mode, when compiling a native extension, the
	`rake compile` prints the compiling commands such as
	"gcc -I. <...> path/to/file" instead of "compiling path/to/file".

	```
	$ git clone https://github.com/deivid-rodriguez/byebug.git
	$ cd byebug
	$ bundle install --standalone
	$ bundle exec rake compile
	...
	gcc -I. <...> path/to/file
	...
	```
	---
	 configure.ac | 7 +++++++
	 lib/mkmf.rb  | 3 ++-
	 2 files changed, 9 insertions(+), 1 deletion(-)
---
 configure.ac | 7 +++++++
 lib/mkmf.rb  | 3 ++-
 version.h    | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index fba306958d..381b2484ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4190,6 +4190,13 @@ AS_IF([test -z "$MANTYPE"], [ https://github.com/ruby/ruby/blob/trunk/configure.ac#L4190
 ])
 AC_SUBST(MANTYPE)
 
+MKMF_VERBOSE=0
+AC_ARG_ENABLE(mkmf-verbose,
+    AS_HELP_STRING([--enable-mkmf-verbose], [enable verbose in mkmf]),
+    [MKMF_VERBOSE=1],
+    [MKMF_VERBOSE=0])
+AC_SUBST(MKMF_VERBOSE)
+
 AC_ARG_ENABLE(rubygems,
 	AS_HELP_STRING([--disable-rubygems], [disable rubygems by default]),
 	[enable_rubygems="$enableval"], [enable_rubygems=yes])
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 32829e42fc..800035b096 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1964,13 +1964,14 @@ SRC https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L1964
 
   def configuration(srcdir)
     mk = []
+    CONFIG['MKMF_VERBOSE'] ||= "0"
     vpath = $VPATH.dup
     CONFIG["hdrdir"] ||= $hdrdir
     mk << %{
 SHELL = /bin/sh
 
 # V=0 quiet, V=1 verbose.  other values don't work.
-V = 0
+V = #{CONFIG['MKMF_VERBOSE']}
 V0 = $(V:0=)
 Q1 = $(V:1=)
 Q = $(Q1:0=@)
diff --git a/version.h b/version.h
index 28259f7b3d..fa9ed97f62 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L11
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 3
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 129
+#define RUBY_PATCHLEVEL 130
 
 #define RUBY_RELEASE_YEAR 2022
 #define RUBY_RELEASE_MONTH 10
-- 
cgit v1.2.3


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

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