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

From e0084d001b52407505b8cb80bed75ea5b0dcba35 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Fri, 21 Oct 2022 12:35:00 +0900
Subject: merge revision(s) 2304cfa4c08a347f4df4915f88fb062cb12e4eeb:

	Document MakeMakefile#append_cflags

	This method is at least 7 years old and is widely used in the wild.
	Since we need to support it, let's document it to make it discoverable.
	Add docs and move it out of the `# :stopdoc:` zone.
	---
	 lib/mkmf.rb | 25 +++++++++++++++----------
	 1 file changed, 15 insertions(+), 10 deletions(-)
---
 lib/mkmf.rb | 25 +++++++++++++++----------
 version.h   |  4 ++--
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 907c9dbcbc..6f9b8fd670 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -688,16 +688,6 @@ MSG https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L688
     try_compile(MAIN_DOES_NOTHING, flags, {:werror => true}.update(opts))
   end
 
-  def append_cflags(flags, *opts)
-    Array(flags).each do |flag|
-      if checking_for("whether #{flag} is accepted as CFLAGS") {
-           try_cflags(flag, *opts)
-         }
-        $CFLAGS << " " << flag
-      end
-    end
-  end
-
   def with_ldflags(flags)
     ldflags = $LDFLAGS
     $LDFLAGS = flags.dup
@@ -1032,6 +1022,21 @@ SRC https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L1022
 
   # :startdoc:
 
+  # Check whether each given C compiler flag is acceptable and append it
+  # to <tt>$CFLAGS</tt> if so.
+  #
+  # [+flags+] a C compiler flag as a +String+ or an +Array+ of them
+  #
+  def append_cflags(flags, *opts)
+    Array(flags).each do |flag|
+      if checking_for("whether #{flag} is accepted as CFLAGS") {
+           try_cflags(flag, *opts)
+         }
+        $CFLAGS << " " << flag
+      end
+    end
+  end
+
   # Returns whether or not +macro+ is defined either in the common header
   # files or within any +headers+ you provide.
   #
diff --git a/version.h b/version.h
index c728754ede..486162a528 100644
--- a/version.h
+++ b/version.h
@@ -11,11 +11,11 @@ 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 120
+#define RUBY_PATCHLEVEL 121
 
 #define RUBY_RELEASE_YEAR 2022
 #define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 20
+#define RUBY_RELEASE_DAY 21
 
 #include "ruby/version.h"
 
-- 
cgit v1.2.3


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