archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 4adb2d655d: [Backport #16738]

Browse source 
Make RbConfig::CONFIG values mutable [Bug #16738]

	As `RbConfig.expand` modifies the argument and involved `CONFIG`
	values, its values should be mutable.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@67872 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2020-03-30 22:47:56 +00:00
parent 209f345158
commit d4e1eb1dfd
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
test/test_rbconfig.rb
View file

@ -51,4 +51,13 @@ class TestRbConfig < Test::Unit::TestCase
assert_match(/\$\(sitearch|\$\(rubysitearchprefix\)/, val, "#{key} #{bug7823}") assert_match(/\$\(sitearch|\$\(rubysitearchprefix\)/, val, "#{key} #{bug7823}")
end end
end end
if /darwin/ =~ RUBY_PLATFORM
def test_sdkroot
assert_separately([{"SDKROOT" => "$(prefix)/SDKRoot"}], "#{<<~"begin;"}\n#{<<~'end;'}")
begin;
assert_equal RbConfig::CONFIG["prefix"]+"/SDKRoot", RbConfig::CONFIG["SDKROOT"]
end;
end
end
end end

2
tool/mkconfig.rb
View file

@ -245,7 +245,7 @@ print <<EOS if $unicode_version
CONFIG["UNICODE_VERSION"] = #{$unicode_version.dump} CONFIG["UNICODE_VERSION"] = #{$unicode_version.dump}
EOS EOS
print <<EOS if /darwin/ =~ arch print <<EOS if /darwin/ =~ arch
CONFIG["SDKROOT"] = ENV["SDKROOT"] || "" # don't run xcrun everytime, usually useless. CONFIG["SDKROOT"] = "\#{ENV['SDKROOT']}" # don't run xcrun every time, usually useless.
EOS EOS
print <<EOS print <<EOS
CONFIG["archdir"] = "$(rubyarchdir)" CONFIG["archdir"] = "$(rubyarchdir)"

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.5.8" #define RUBY_VERSION "2.5.8"
#define RUBY_RELEASE_DATE "2020-03-31" #define RUBY_RELEASE_DATE "2020-03-31"
#define RUBY_PATCHLEVEL 221 #define RUBY_PATCHLEVEL 222
#define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_YEAR 2020
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3