summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2022-10-21 13:41:35 +0900
committernagachika <nagachika@ruby-lang.org>2022-10-21 13:41:35 +0900
commitac0c771d03573a4e99aff033599cb9f050fea4ff (patch)
treed5f09c6b9a915377dd1c52ffd923e0224324e5e5
parent1ccdd9ee5773b34867fce8c3796e046ee6b2b9f5 (diff)
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(-)
-rw-r--r--configure.ac7
-rw-r--r--lib/mkmf.rb3
-rw-r--r--version.h2
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"], [
])
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
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 @@
# 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