Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Ruby 1.9.3-p374 #1452

Closed
wants to merge 1 commit into from

2 participants

@exviva

Hey, this is my first contribution to RVM, so let me know if I'm doing something wrong.

I've basically duplicated fd79ca4. I'm not sure the mutlilib patch is still needed, the corresponding bug report has been closed for months.

@mpapis mpapis closed this in 9b28957
@mpapis
Owner

thanks for the pull - #1451 was first and I need to cut down part of the patch as it's already partially merged

@exviva

Perfect, thanks!

@exviva exviva deleted the exviva:ruby-1.9.3-p374 branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jan 17, 2013
  1. @exviva

    ruby-1.9.3-p374

    exviva authored
This page is out of date. Refresh to see the latest.
View
2  config/db
@@ -22,7 +22,7 @@ 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_version=1.9.3
ruby_2.0.0_patch_level=rc1
-ruby_1.9.3_patch_level=p362
+ruby_1.9.3_patch_level=p374
ruby_1.9.2_patch_level=p320
ruby_1.9.1_patch_level=p431
ruby_1.8.7_patch_level=p371
View
3  config/known
@@ -7,7 +7,8 @@
[ruby-]1.9.3-p194
[ruby-]1.9.3-p286
[ruby-]1.9.3-p327
-[ruby-]1.9.3[-p362]
+[ruby-]1.9.3-p362
+[ruby-]1.9.3[-p374]
[ruby-]1.9.3-head
[ruby-]2.0.0-rc1
ruby-head
View
2  config/md5
@@ -135,6 +135,8 @@ 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-1.9.3-p374.tar.gz=90b6c327abcdf30a954c2d6ae44da2a9
+ruby-1.9.3-p374.tar.bz2=944e73eba9ee9e1f2647ff32ec0b14b2
ruby-2.0.0-preview1.tar.bz2=47a0f662f0e258aa1c5e429c310861b3
ruby-2.0.0-preview2.tar.bz2=a645a783c3302cc094a9963a5e700a4d
ruby-2.0.0-rc1.tar.bz2=24cebdda11e01ff4889ac983cd7dc02c
View
39 patches/ruby/1.9.3/p374/ruby-multilib.patch
@@ -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
View
2  scripts/functions/manage/ruby
@@ -179,7 +179,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-p362)
+ ruby-1.9.3-p125|ruby-1.9.3-p286|ruby-1.9.3-p327|ruby-1.9.3-p362|ruby-1.9.3-p374)
rvm_patch_names+=( ruby-multilib )
;;
esac
Something went wrong with that request. Please try again.