archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-20 11:03:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 38776: [Backport #7172]

Browse source 
* tool/mkconfig.rb: use configured libdir value to fix
	  --enable-load-relative on systems where libdir is not default value,
	  overridden in config.site files.  [ruby-core:47267] [Bug #6903]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38828 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2013-01-15 07:03:47 +00:00
parent 00decfdbca
commit ae92565e04
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Tue Jan 15 16:03:30 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* tool/mkconfig.rb: use configured libdir value to fix
--enable-load-relative on systems where libdir is not default value,
overridden in config.site files. [ruby-core:47267] [Bug #6903]
Tue Jan 15 15:55:09 2013 Eric Hodel <drbrain@segment7.net> Tue Jan 15 15:55:09 2013 Eric Hodel <drbrain@segment7.net>
* object.c (Init_Object): Added RDoc location pointers for * object.c (Init_Object): Added RDoc location pointers for

5
tool/mkconfig.rb
View file

@ -39,6 +39,7 @@ win32 = /mswin/ =~ arch
universal = /universal.*darwin/ =~ arch universal = /universal.*darwin/ =~ arch
v_fast = [] v_fast = []
v_others = [] v_others = []
v_runtime = {}
vars = {} vars = {}
continued_name = nil continued_name = nil
continued_line = nil continued_line = nil
@ -114,6 +115,8 @@ File.foreach "config.status" do |line|
if name == "configure_args" if name == "configure_args"
val.gsub!(/ +(?!-)/, "=") if win32 val.gsub!(/ +(?!-)/, "=") if win32
val.gsub!(/--with-out-ext/, "--without-ext") val.gsub!(/--with-out-ext/, "--without-ext")
elsif name == "libdir"
v_runtime[:libdir] = val[/\$(\(exec_prefix\)|\{exec_prefix\})\/(.*)/, 2]
end end
val = val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump val = val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump
case name case name
@ -145,7 +148,7 @@ end
drive = File::PATH_SEPARATOR == ';' drive = File::PATH_SEPARATOR == ';'
prefix = "/lib/ruby/#{version}/#{arch}" prefix = "/#{v_runtime[:libdir] || 'lib'}/ruby/#{version}/#{arch}"
print " TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n" print " TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n"
print " DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n" print " DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n"
print <<'ARCH' if universal print <<'ARCH' if universal

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3" #define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 368 #define RUBY_PATCHLEVEL 369
#define RUBY_RELEASE_DATE "2013-01-15" #define RUBY_RELEASE_DATE "2013-01-15"
#define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_YEAR 2013