From e8cb6dae740d5c5613854f8b280a7b0cf5a0fa17 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@ruby-lang.org>
Date: Fri, 21 Oct 2022 15:20:36 +0900
Subject: merge revision(s) 518301883edee12218657c77ba977e2bde1b17d0:

	Fix parallel build on MINGW

	When the build is running with a base ruby then generating `x64-ucrt-ruby320.rc`
	could fail due to a missing dependency to `x64-mingw-ucrt-fake.rb`.
	This commit adds this dependency.

	A failing build looks like so:
	```
	generating x64-mingw-ucrt-fake.rb
	generating x64-ucrt-ruby320.rc
	../snapshot-master/win32/resource.rb:in `require': cannot load such file -- ./x64-mingw-ucrt-fake (LoadError)
	make: *** [GNUmakefile:57: x64-ucrt-ruby320.rc] Error 1
	make: *** Waiting for unfinished jobs....
	linking miniruby.exe
	x64-mingw-ucrt-fake.rb updated
	```
	---
	 cygwin/GNUmakefile.in | 4 ++--
	 template/Makefile.in  | 1 +
	 2 files changed, 3 insertions(+), 2 deletions(-)
---
 cygwin/GNUmakefile.in | 4 ++--
 template/Makefile.in  | 1 +
 version.h             | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index 125b2bf7fc..b38df46317 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -53,7 +53,7 @@ $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@
 	$(ECHO) compiling $@
 	$(Q) $(WINDRES) --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
 
-%.rc: $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
+%.rc: $(BOOTSTRAPRUBY_FAKE) $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
 	$(ECHO) generating $@
 	$(Q) $(BOOTSTRAPRUBY_COMMAND) $(srcdir)/win32/resource.rb \
 	  -ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \
@@ -94,7 +94,7 @@ endif
 
 $(LIBRUBY_SO): $(RUBYDEF)
 
-$(RUBYDEF): $(LIBRUBY_A) $(PREP) $(RBCONFIG)
+$(RUBYDEF): $(LIBRUBY_A) $(PREP) $(BOOTSTRAPRUBY_FAKE) $(RBCONFIG)
 	$(ECHO) generating $@
 	$(Q) $(BOOTSTRAPRUBY_COMMAND) $(srcdir)/win32/mkexports.rb -output=$@ $(LIBRUBY_A)
 
diff --git a/template/Makefile.in b/template/Makefile.in
index 2e86465832..86f8b1e969 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
@@ -160,6 +160,7 @@ yes_baseruby = $(HAVE_BASERUBY:no=)
 no_baseruby = $(HAVE_BASERUBY:yes=)
 BOOTSTRAPRUBY = $(yes_baseruby:yes=$(BASERUBY)) $(no_baseruby:no=$(MINIRUBY))
 BOOTSTRAPRUBY_OPT = $(yes_baseruby:yes=-r./$(arch)-fake)
+BOOTSTRAPRUBY_FAKE = $(yes_baseruby:yes=$(arch)-fake.rb)
 
 COROUTINE_H = @X_COROUTINE_H@
 COROUTINE_OBJ = $(COROUTINE_H:.h=.@OBJEXT@)
diff --git a/version.h b/version.h
index 6fae581e26..f2c7dd10fc 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 147
+#define RUBY_PATCHLEVEL 148
 
 #define RUBY_RELEASE_YEAR 2022
 #define RUBY_RELEASE_MONTH 10
-- 
cgit v1.2.3