bleak_house 4.2 → 4.2.1

data/CHANGELOG

@@ -1,5 +1,5 @@
 
-v4.2. Harden patch/build process. Fix bug.
+v4.2.1. Harden patch/build process. Fix bug.
 
 v4.1.1. Update bundled Ruby to patchlevel 230.
 

data/bleak_house.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bleak_house}
-  s.version = "4.2"
+  s.version = "4.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]

data/ext/build_ruby.rb

@@ -16,6 +16,7 @@ require 'fileutils'
 require 'rbconfig'
 
 def execute(command)    
+  puts command
   unless system(command)
     puts "Failed: #{command.inspect}"
     exit -1 
@@ -32,12 +33,11 @@ end
 
 if which('ruby-bleak-house') and
   (patchlevel  = `ruby-bleak-house -e "puts RUBY_PATCHLEVEL"`.to_i) >= 903
-  puts "Binary `ruby-bleak-house` is already available (patchlevel #{patchlevel})"
+  puts "** Binary `ruby-bleak-house` is already available (patchlevel #{patchlevel})"
 else
   # Build
   Dir.chdir(tmp) do
     build_dir = "bleak_house"
-    binary_dir = File.dirname(`which ruby`)
 
     FileUtils.rm_rf(build_dir) rescue nil
     if File.exist? build_dir
@@ -49,48 +49,58 @@ else
     begin
       Dir.chdir(build_dir) do
 
-        puts "Copy Ruby source"
+        puts "** Copy Ruby source"
         bz2 = "ruby-1.8.6-p286.tar.bz2"
         FileUtils.copy "#{source_dir}/#{bz2}", bz2
 
-        puts "Extract"
+        puts "** Extract"
         execute("tar xjf #{bz2}")
         File.delete bz2
 
         Dir.chdir("ruby-1.8.6-p286") do
 
-          puts "Patch, configure, and build"
-          execute("patch -p0 < \'#{source_dir}/ruby.patch\'")
+          puts "** Patch Ruby"
+          execute("patch -p0 < '#{source_dir}/ruby.patch'")
 
-          execute("./configure --prefix=#{binary_dir[0..-5]}") # --with-static-linked-ext
+          puts "** Configure"
+          execute("./configure #{Config::CONFIG['configure_args']}".sub("'--enable-shared'", ""))
 
-          puts "Patch the makefile for arch/sitedir"
+          puts "Patch Makefile"
+          # FIXME Why is this necessary?
           makefile = File.read('Makefile')
           %w{arch sitearch sitedir}.each do | key |
             makefile.gsub!(/#{key} = .*/, "#{key} = #{Config::CONFIG[key]}")
           end
           File.open('Makefile', 'w'){|f| f.puts(makefile)}
 
-          puts "Patch the config.h for constants"
+          puts "Patch config.h"
           constants = {
-            'RUBY_LIB' => 'rubylibdir',          #define RUBY_LIB "/usr/lib/ruby/1.8"
-            'RUBY_SITE_LIB' => 'sitedir',        #define RUBY_SITE_LIB "/usr/lib/ruby/site_ruby"
-            'RUBY_SITE_LIB2' => 'sitelibdir',    #define RUBY_SITE_LIB2 "/usr/lib/ruby/site_ruby/1.8"
-            'RUBY_PLATFORM' => 'arch',           #define RUBY_PLATFORM "i686-linux"
-            'RUBY_ARCHLIB' => 'topdir',          #define RUBY_ARCHLIB "/usr/lib/ruby/1.8/i686-linux"
-            'RUBY_SITE_ARCHLIB' => 'sitearchdir' #define RUBY_SITE_ARCHLIB "/usr/lib/ruby/site_ruby/1.8/i686-linux"
+            'RUBY_LIB' => 'rubylibdir',
+            'RUBY_SITE_LIB' => 'sitedir',
+            'RUBY_SITE_LIB2' => 'sitelibdir',
+            'RUBY_PLATFORM' => 'arch',
+            'RUBY_ARCHLIB' => 'topdir',
+            'RUBY_SITE_ARCHLIB' => 'sitearchdir'
           }
           config_h = File.read('config.h')
           constants.each do | const, key |
             config_h.gsub!(/#define #{const} .*/, "#define #{const} \"#{Config::CONFIG[key]}\"")
           end
-          File.open('config.h', 'w'){|f| f.puts(config_h)}
 
-          execute("make")
+          File.open('config.h', 'w') do |f| 
+            f.puts(config_h)
+          end
+          
+          env = Config::CONFIG.map do |key, value|
+            "#{key}=#{value.inspect}" if key.upcase == key and value
+          end.compact.join(" ")            
+
+          puts "** Make"
+          execute("env #{env} make")
 
-          binary = "#{binary_dir}/ruby-bleak-house"
+          binary = "#{Config::CONFIG['bindir']}/ruby-bleak-house"
 
-          puts "Install binary"
+          puts "** Install binary"
           if File.exist? "ruby"
             # Avoid "Text file busy" error
             File.delete binary if File.exist? binary

data/lib/bleak_house.rb

@@ -1,5 +1,5 @@
 
-unless RUBY_PATCHLEVEL > 900
+unless RUBY_PATCHLEVEL >= 903
   raise "This build of Ruby has not been successfully patched for BleakHouse."
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bleak_house
 version: !ruby/object:Gem::Version 
-  version: "4.2"
+  version: 4.2.1
 platform: ruby
 authors: 
 - Evan Weaver