@@ -32,7 +32,7 @@ def which(basename) end if which('ruby-bleak-house') and - (patchlevel = `ruby-bleak-house -e "puts RUBY_PATCHLEVEL"`.to_i) >= 903 + (patchlevel = `ruby-bleak-house -e "puts RUBY_PATCHLEVEL"`.to_i) >= 904 puts "** Binary `ruby-bleak-house` is already available (patchlevel #{patchlevel})" else # Build @@ -62,8 +62,12 @@ else puts "** Patch Ruby" execute("patch -p0 < '#{source_dir}/ruby.patch'") + env = Config::CONFIG.map do |key, value| + "#{key}=#{value.inspect}" if key.upcase == key and value + end.compact.join(" ") + puts "** Configure" - execute("./configure #{Config::CONFIG['configure_args']}".sub("'--enable-shared'", "")) + execute("env #{env} ./configure #{Config::CONFIG['configure_args']}".sub("'--enable-shared'", "")) puts "Patch Makefile" # FIXME Why is this necessary? @@ -86,15 +90,10 @@ else constants.each do | const, key | config_h.gsub!(/#define #{const} .*/, "#define #{const} \"#{Config::CONFIG[key]}\"") end - 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") ext/build_ruby.rb @@ -1,5 +1,5 @@ -unless RUBY_PATCHLEVEL >= 903 +unless RUBY_PATCHLEVEL >= 904 raise "This build of Ruby has not been successfully patched for BleakHouse." end lib/bleak_house.rb d95e53fef7e13a314dc7a758a03dc1da04f31873 Evan Weaver eweaver@twitter.com http://github.com/fauna/bleak_house/commit/ad0c371b2ea49c3903ccfe16bbe38e995a393024 ad0c371b2ea49c3903ccfe16bbe38e995a393024 2009-02-26T17:00:31-08:00 2009-02-26T17:00:31-08:00 Use env flags for configure step. 2faa96498c4e42e774267f0214c2b6c05a24cf82 Evan Weaver eweaver@twitter.com