summaryrefslogtreecommitdiffstats
path: root/rubygem-nokogiri-1.5.0-allow-non-crosscompile.patch
diff options
context:
space:
mode:
authorTASAKA Mamoru <mtasaka@localhost.localdomain>2012-01-18 16:53:43 +0900
committerTASAKA Mamoru <mtasaka@localhost.localdomain>2012-01-18 16:53:43 +0900
commit53c144ce26d07504fa23cf3c441f4d0a40cc94c5 (patch)
treee7315e63cf4587430c046949e48fde2ba5f673f5 /rubygem-nokogiri-1.5.0-allow-non-crosscompile.patch
parent71613a1b77fc9164c95b5130c917eb9304da82c4 (diff)
downloadrubygem-nokogiri-53c144ce26d07504fa23cf3c441f4d0a40cc94c5.tar.gz
rubygem-nokogiri-53c144ce26d07504fa23cf3c441f4d0a40cc94c5.tar.xz
rubygem-nokogiri-53c144ce26d07504fa23cf3c441f4d0a40cc94c5.zip
1.5.0
Diffstat (limited to 'rubygem-nokogiri-1.5.0-allow-non-crosscompile.patch')
-rw-r--r--rubygem-nokogiri-1.5.0-allow-non-crosscompile.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/rubygem-nokogiri-1.5.0-allow-non-crosscompile.patch b/rubygem-nokogiri-1.5.0-allow-non-crosscompile.patch
new file mode 100644
index 0000000..f45734b
--- /dev/null
+++ b/rubygem-nokogiri-1.5.0-allow-non-crosscompile.patch
@@ -0,0 +1,26 @@
+--- nokogiri-1.5.0/Rakefile.debug 2012-01-18 16:23:02.472224272 +0900
++++ nokogiri-1.5.0/Rakefile 2012-01-18 16:23:29.935430496 +0900
+@@ -83,14 +83,21 @@
+ HOE.spec.files += ['lib/nokogiri/nokogiri.jar']
+ end
+ else
+- require 'tasks/cross_compile'
++ do_cross_compile = true
++ begin
++ require 'tasks/cross_compile'
++ rescue RuntimeError => e
++ warn "WARNING: Could not perform some cross-compiling: #{e}"
++ do_cross_compile = false
++ end
+ require "rake/extensiontask"
+
+- HOE.spec.files.reject! { |f| f =~ %r{^ext/java|\.jar$} }
++ HOE.spec.files.reject! { |f| f =~ %r{^ext/java|\.jar$} } if do_cross_compile
+
+ Rake::ExtensionTask.new("nokogiri", HOE.spec) do |ext|
+ ext.lib_dir = File.join(*['lib', 'nokogiri', ENV['FAT_DIR']].compact)
+ ext.config_options << ENV['EXTOPTS']
++ next unless do_cross_compile
+ ext.cross_compile = true
+ ext.cross_platform = ["x86-mswin32-60", "x86-mingw32"]
+ ext.cross_config_options << "--with-xml2-include=#{File.join($recipes[:libxml2].path, 'include', 'libxml2')}"