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

ruby-changes:74105

From: nagachika <ko1@a...>
Date: Tue, 18 Oct 2022 21:52:02 +0900 (JST)
Subject: [ruby-changes:74105] b4f8f4ce85 (ruby_3_1): merge revision(s) 77f3f8a1d4f45d06df6cfea2bac3a67867c19efb:

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

From b4f8f4ce85c8adcba11931422b065aac6f06f50b Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Tue, 18 Oct 2022 21:27:33 +0900
Subject: merge revision(s) 77f3f8a1d4f45d06df6cfea2bac3a67867c19efb:

	exts.mk.tmpl: propagate MINIRUBY to enc.mk even though invoking from
	 exts.mk

	This is another attempt to fix out-of-src build with
	--with-static-linked-ext. The first attempt was
	4f1888bda70981d9f5b1bf55ab692e0ce18e79f4 but reverted because it broke
	out-of-src build from pre-generated sources via `make dist`.
	This patch fixes the second trans C source gen, mentioned in the
	previous commit message, by passing MINIRUBY as well as when invoking
	from common.mk
	---
	 common.mk             | 2 +-
	 template/exts.mk.tmpl | 2 +-
	 2 files changed, 2 insertions(+), 2 deletions(-)
---
 common.mk             | 2 +-
 template/exts.mk.tmpl | 2 +-
 version.h             | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common.mk b/common.mk
index 7e97562d77..ca65dac142 100644
--- a/common.mk
+++ b/common.mk
@@ -303,7 +303,7 @@ configure-ext: $(EXTS_MK) https://github.com/ruby/ruby/blob/trunk/common.mk#L303
 
 build-ext: $(EXTS_MK)
 	$(Q)$(MAKE) -f $(EXTS_MK) $(mflags) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) \
-	    EXTENCS="$(ENCOBJS)" UPDATE_LIBRARIES=no $(EXTSTATIC)
+	    EXTENCS="$(ENCOBJS)" MINIRUBY="$(MINIRUBY)" UPDATE_LIBRARIES=no $(EXTSTATIC)
 	$(Q)$(MAKE) $(EXTS_NOTE)
 
 exts-note: $(EXTS_MK)
diff --git a/template/exts.mk.tmpl b/template/exts.mk.tmpl
index 2bee7afe0a..c5f8478d76 100644
--- a/template/exts.mk.tmpl
+++ b/template/exts.mk.tmpl
@@ -132,7 +132,7 @@ distclean: https://github.com/ruby/ruby/blob/trunk/template/exts.mk.tmpl#L132
 % end
 
 libencs:
-	$(Q)$(MAKE)<%=mflags%> -f enc.mk V=$(V) $@
+	$(Q)$(MAKE)<%=mflags%> -f enc.mk V=$(V) MINIRUBY="$(MINIRUBY)" $@
 ext/extinit.<%=objext%>:
 	$(Q)$(MAKE)<%=mflags%> V=$(V) EXTINITS="$(EXTINITS)" $@
 
diff --git a/version.h b/version.h
index 973c47ab62..ab39b3626b 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 99
+#define RUBY_PATCHLEVEL 100
 
 #define RUBY_RELEASE_YEAR 2022
 #define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 16
+#define RUBY_RELEASE_DAY 18
 
 #include "ruby/version.h"
 
-- 
cgit v1.2.3


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

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