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

ruby-changes:71814

From: Kazuhiro <ko1@a...>
Date: Fri, 13 May 2022 08:44:51 +0900 (JST)
Subject: [ruby-changes:71814] 2d1032075a (master): Stop `build_extensions` when DESTDIR set

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

From 2d1032075a4654b8b54dde96424f299f7f29f9d6 Mon Sep 17 00:00:00 2001
From: Kazuhiro NISHIYAMA <zn@m...>
Date: Fri, 13 May 2022 08:44:17 +0900
Subject: 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(-)

diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index df8600d332..cbefb0ebbc 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -904,7 +904,7 @@ module RbInstall https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L904
       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
-- 
cgit v1.2.1


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

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