diff options
author | nagachika <nagachika@ruby-lang.org> | 2022-10-15 16:33:45 +0900 |
---|---|---|
committer | nagachika <nagachika@ruby-lang.org> | 2022-10-15 16:33:45 +0900 |
commit | 95e996e3350484e7845c681593498d9031de1488 (patch) | |
tree | 6a472bc56003ab50eb248b7948cd66895c7200b4 | |
parent | fa2ddb67c5a19d1c165fbba4102ca7a397fa50d5 (diff) |
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(-)
-rwxr-xr-x | tool/rbinstall.rb | 2 | ||||
-rw-r--r-- | 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 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 @@ -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 85 +#define RUBY_PATCHLEVEL 86 #define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_MONTH 10 |