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

ruby-changes:74008

From: nagachika <ko1@a...>
Date: Sat, 15 Oct 2022 17:28:37 +0900 (JST)
Subject: [ruby-changes:74008] 95e996e335 (ruby_3_1): merge revision(s) 2d1032075a4654b8b54dde96424f299f7f29f9d6:

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

From 95e996e3350484e7845c681593498d9031de1488 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Sat, 15 Oct 2022 16:33:45 +0900
Subject: merge revision(s) 2d1032075a4654b8b54dde96424f299f7f29f9d6:

	Stop `build_extensions` when DESTDIR set

	Try to fix `make install without root privilege` failures on snapshot CIs.

	example: https://github.com/ruby/actions/actions/runs/2315349280
	---
	 tool/rbinstall.rb | 2 +-
	 1 file changed, 1 insertion(+), 1 deletion(-)
---
 tool/rbinstall.rb | 2 +-
 version.h         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index b643fc8676..a644beedd4 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -899,7 +899,7 @@ module RbInstall https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L899
       RbInstall.no_write(options) {super}
     end
 
-    if RbConfig::CONFIG["LIBRUBY_RELATIVE"] == "yes" || RbConfig::CONFIG["CROSS_COMPILING"] == "yes"
+    if RbConfig::CONFIG["LIBRUBY_RELATIVE"] == "yes" || RbConfig::CONFIG["CROSS_COMPILING"] == "yes" || ENV["DESTDIR"]
       # TODO: always build extensions in bundled gems by build-ext and
       # install the built binaries.
       def build_extensions
diff --git a/version.h b/version.h
index b8964bd1be..6b4236ac55 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 85
+#define RUBY_PATCHLEVEL 86
 
 #define RUBY_RELEASE_YEAR 2022
 #define RUBY_RELEASE_MONTH 10
-- 
cgit v1.2.1


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

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