Skip to content

Commit

Permalink
Update 1.8.7 build.
Browse files Browse the repository at this point in the history
  • Loading branch information
Evan Weaver committed Sep 3, 2009
1 parent da27630 commit 9434a46
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 18 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG
@@ -1,4 +1,6 @@

v4.4. Switch to Ruby 1.8.7p72.

v4.3. Build against OpenSSL 0.9.8j or later (kennethkalmer). Bugfixes (Pete Hodgson, joshuabates).

v4.2.1. Harden patch/build process. Fix bug.
Expand Down
31 changes: 13 additions & 18 deletions ext/build_ruby.rb
Expand Up @@ -50,8 +50,7 @@ def which(basename)
Dir.chdir(build_dir) do

puts "** Copy Ruby source"
# bz2 = "ruby-1.8.6-p286.tar.bz2"
bz2 = "ruby-1.8.7-p72.tar.bz2"
bz2 = "ruby-1.8.7-p74.tar.bz2"
FileUtils.copy "#{source_dir}/#{bz2}", bz2

puts "** Extract"
Expand All @@ -63,22 +62,18 @@ def which(basename)
puts "** Patch Ruby"
execute("patch -p1 < '#{source_dir}/ruby187.patch'")

puts "** Determining OpenSSL version"
cmd = open("|openssl version")
openssl_version_string = cmd.gets
cmd.close

if openssl_version_string.nil?
puts "** Could not determine openssl version, skipping patches"
else
openssl_version = openssl_version_string.split(/\s/)[1]
if openssl_version >= "0.9.8j"
puts "** Applying openssl patches to build against #{openssl_version_string}"
execute( "patch -p3 < '#{source_dir}/ruby-1.8.6-openssl.patch'")
else
puts "** No patching need for #{openssl_version_string}"
end
end
puts "** Determining OpenSSL version"
cmd = open("|openssl version")
openssl_version_string = cmd.gets
cmd.close

if openssl_version_string
openssl_version = openssl_version_string.split(/\s/)[1]
if openssl_version >= "0.9.8j"
puts "** Applying openssl patches to build against #{openssl_version_string}"
execute( "patch -p3 < '#{source_dir}/openssl.patch'")
end
end

env = Config::CONFIG.map do |key, value|
"#{key}=#{value.inspect}" if key.upcase == key and value
Expand Down
File renamed without changes.
Binary file added ruby/ruby-1.8.7-p174.tar.bz2
Binary file not shown.
Binary file removed ruby/ruby-1.8.7-p72.tar.bz2
Binary file not shown.

0 comments on commit 9434a46

Please sign in to comment.