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

ruby-changes:74025

From: nagachika <ko1@a...>
Date: Sun, 16 Oct 2022 18:40:51 +0900 (JST)
Subject: [ruby-changes:74025] e7b557cefe (ruby_3_1): merge revision(s) 32d1ce96e09773e809d575c17b916012d88d6ffc:

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

From e7b557cefe870a7d83b6ac7cf6edf1997afcc29a Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Sun, 16 Oct 2022 16:46:29 +0900
Subject: merge revision(s) 32d1ce96e09773e809d575c17b916012d88d6ffc:

	Fix race conditions when cleaning extensions

	Clean built directories by `make distclean`, and then clean leftover
	makefiles for skipped extensions.
	---
	 template/Makefile.in | 4 ++++
	 1 file changed, 4 insertions(+)
---
 template/Makefile.in | 4 ++++
 version.h            | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/template/Makefile.in b/template/Makefile.in
index 7e23b716a1..d4efb32725 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
@@ -512,6 +512,10 @@ ext/realclean:: ext/realclean.sub https://github.com/ruby/ruby/blob/trunk/template/Makefile.in#L512
 .bundle/distclean:: .bundle/distclean.sub
 .bundle/realclean:: .bundle/realclean.sub
 
+ext/clean.sub .bundle/clean.sub:: ext/clean.mk
+ext/distclean.sub .bundle/distclean.sub:: ext/distclean.mk
+ext/realclean.sub .bundle/realclean.sub:: ext/realclean.mk
+
 ext/clean.sub ext/distclean.sub ext/realclean.sub \
 .bundle/clean.sub .bundle/distclean.sub .bundle/realclean.sub::
 	$(Q) set dummy `echo "${EXTS}" | tr , ' '`; shift; \
diff --git a/version.h b/version.h
index 6932a6916b..66996a6281 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 95
+#define RUBY_PATCHLEVEL 96
 
 #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/

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