@@ -59,11 +59,37 @@ else Dir.chdir("ruby-1.8.6-p286") do - puts "** Patch" + puts "** Patch Ruby" execute("patch -p0 < '#{source_dir}/ruby.patch'") puts "** Configure" - execute("./configure #{Config::CONFIG['configure_args']}") + execute("./configure #{Config::CONFIG['configure_args']}".sub("'--enable-shared'", "")) + + 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 config.h" + constants = { + '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') do |f| + f.puts(config_h) + end env = Config::CONFIG.map do |key, value| "#{key}=#{value.inspect}" if key.upcase == key and value ext/build_ruby.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 lib/bleak_house.rb 7f735f0a2dc8df327d079ad95e38421ef3ea8466 Evan Weaver eweaver@twitter.com http://github.com/fauna/bleak_house/commit/d95e53fef7e13a314dc7a758a03dc1da04f31873 d95e53fef7e13a314dc7a758a03dc1da04f31873 2009-02-20T19:19:06-08:00 2009-02-20T19:19:06-08:00 Fix up. 37a784c9ebb1ac70b997300986a2831409f4c7e1 Evan Weaver eweaver@twitter.com