Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'hotfix/1.17.6' into stable

  • Loading branch information...
commit 03dd9e3983b90bdc9045787ae55ac18f1df9724b 2 parents 33a5273 + fd79ca4
Michal Papis mpapis authored
2  VERSION
View
@@ -1 +1 @@
-1.17.5
+1.17.6
4 config/db
View
@@ -4,7 +4,7 @@ niceness=0
interpreter=ruby
ruby_version=1.9.3
ruby_configure_flags=--enable-shared --disable-install-doc
-ruby_patchlevel=327
+ruby_patchlevel=362
ruby_configure=--enable-shared
tcs_repo_url=git://github.com/thecodeshop/ruby.git
tcs_repo_branch=trunk
@@ -22,7 +22,7 @@ ruby_1.8_url=http://ftp.ruby-lang.org/pub/ruby/1.8
ruby_1.9_url=http://ftp.ruby-lang.org/pub/ruby/1.9
ruby_2.0_url=http://ftp.ruby-lang.org/pub/ruby/2.0
ruby_2.0.0_patch_level=review2
-ruby_1.9.3_patch_level=327
+ruby_1.9.3_patch_level=362
ruby_1.9.2_patch_level=320
ruby_1.9.1_patch_level=431
ruby_1.8.7_patch_level=371
3  config/known
View
@@ -6,7 +6,8 @@
[ruby-]1.9.3-p125
[ruby-]1.9.3-p194
[ruby-]1.9.3-p286
-[ruby-]1.9.3-[p327]
+[ruby-]1.9.3-p327
+[ruby-]1.9.3[-p362]
[ruby-]1.9.3-head
[ruby-]2.0.0-preview2
ruby-head
1  config/md5
View
@@ -132,6 +132,7 @@ ruby-1.9.3-p194.tar.gz=bc0c715c69da4d1d8bd57069c19f6c0e
ruby-1.9.3-p286.tar.bz2=e76848a86606a4fd5dcf14fc4b4e755e
ruby-1.9.3-p327.tar.gz=96118e856b502b5d7b3a4398e6c6e98c
ruby-1.9.3-p327.tar.bz2=7d602aba93f31ceef32800999855fbca
+ruby-1.9.3-p362.tar.bz2=13c26ea368d88a560f07cc8c5eb4fa05
ruby-2.0.0-preview1.tar.bz2=47a0f662f0e258aa1c5e429c310861b3
ruby-2.0.0-preview2.tar.bz2=a645a783c3302cc094a9963a5e700a4d
ruby-enterprise-1.8.6-20080507.tar.gz=17e3c52e73e42809f57ad0000a6cb4ab
39 patches/ruby/1.9.3/p362/ruby-multilib.patch
View
@@ -0,0 +1,39 @@
+diff -u -wr a/tool/mkconfig.rb b/tool/mkconfig.rb
+--- a/tool/mkconfig.rb 2012-10-08 05:57:16.948702976 +0200
++++ b/tool/mkconfig.rb 2011-08-13 15:17:30.000000000 +0200
+@@ -40,6 +40,7 @@
+ v_fast = []
+ v_others = []
+ vars = {}
++v_runtime = {}
+ continued_name = nil
+ continued_line = nil
+ File.foreach "config.status" do |line|
+@@ -118,7 +119,10 @@
+ val = val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump
+ case name
+ when /^prefix$/
++ v_runtime[:prefix] = val.slice(1..-2)
+ val = "(TOPDIR || DESTDIR + #{val})"
++ when /^libdir$/
++ v_runtime[:libdir] = File.basename(val.slice(1..-2))
+ when /^ARCH_FLAG$/
+ val = "arch_flag || #{val}" if universal
+ when /^UNIVERSAL_ARCHNAMES$/
+@@ -145,7 +149,7 @@
+
+ drive = File::PATH_SEPARATOR == ';'
+
+-prefix = "/lib/ruby/#{version}/#{arch}"
++prefix = "/#{v_runtime[:libdir]}/ruby/#{version}/#{arch}"
+ print " TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n"
+ print " DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n"
+ print <<'ARCH' if universal
+@@ -190,6 +194,7 @@
+ x
+ end
+ end
++v_others.map!{|x| x.gsub(v_runtime[:prefix], "$(prefix)") }
+ v_others.compact!
+
+ if $install_name
2  scripts/functions/manage/ruby
View
@@ -95,7 +95,7 @@ ruby_install()
[[ " ${rvm_configure_flags[*]}" =~ " --enable-load-relative" ]]
then
case ${rvm_ruby_string} in
- ruby-1.9.3-p125|ruby-1.9.3-p286|ruby-1.9.3-p327)
+ ruby-1.9.3-p125|ruby-1.9.3-p286|ruby-1.9.3-p327|ruby-1.9.3-p362)
rvm_patch_names+=( ruby-multilib )
;;
esac
Please sign in to comment.
Something went wrong with that request. Please try again.