1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70
|
Remove hash with verbose from calls to FileUtils. This apparently
has stopped being supported in ruby.
Debian bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1008426
Index: h2o-2.2.5+dfsg2/deps/mruby/Rakefile
===================================================================
--- h2o-2.2.5+dfsg2.orig/deps/mruby/Rakefile
+++ h2o-2.2.5+dfsg2/deps/mruby/Rakefile
@@ -37,15 +37,15 @@ load "#{MRUBY_ROOT}/tasks/gitlab.rake"
task :default => :all
bin_path = ENV['INSTALL_DIR'] || "#{MRUBY_ROOT}/bin"
-FileUtils.mkdir_p bin_path, { :verbose => $verbose }
+FileUtils.mkdir_p bin_path
depfiles = MRuby.targets['host'].bins.map do |bin|
install_path = MRuby.targets['host'].exefile("#{bin_path}/#{bin}")
source_path = MRuby.targets['host'].exefile("#{MRuby.targets['host'].build_dir}/bin/#{bin}")
file install_path => source_path do |t|
- FileUtils.rm_f t.name, { :verbose => $verbose }
- FileUtils.cp t.prerequisites.first, t.name, { :verbose => $verbose }
+ FileUtils.rm_f t.name
+ FileUtils.cp t.prerequisites.first, t.name
end
install_path
@@ -78,8 +78,8 @@ MRuby.each_target do |target|
install_path = MRuby.targets['host'].exefile("#{bin_path}/#{bin}")
file install_path => exec do |t|
- FileUtils.rm_f t.name, { :verbose => $verbose }
- FileUtils.cp t.prerequisites.first, t.name, { :verbose => $verbose }
+ FileUtils.rm_f t.name
+ FileUtils.cp t.prerequisites.first, t.name
end
depfiles += [ install_path ]
elsif target == MRuby.targets['host-debug']
@@ -87,8 +87,8 @@ MRuby.each_target do |target|
install_path = MRuby.targets['host-debug'].exefile("#{bin_path}/#{bin}")
file install_path => exec do |t|
- FileUtils.rm_f t.name, { :verbose => $verbose }
- FileUtils.cp t.prerequisites.first, t.name, { :verbose => $verbose }
+ FileUtils.rm_f t.name
+ FileUtils.cp t.prerequisites.first, t.name
end
depfiles += [ install_path ]
end
@@ -127,16 +127,16 @@ end
desc "clean all built and in-repo installed artifacts"
task :clean do
MRuby.each_target do |t|
- FileUtils.rm_rf t.build_dir, { :verbose => $verbose }
+ FileUtils.rm_rf t.build_dir
end
- FileUtils.rm_f depfiles, { :verbose => $verbose }
+ FileUtils.rm_f depfiles
puts "Cleaned up target build folder"
end
desc "clean everything!"
task :deep_clean => ["clean"] do
MRuby.each_target do |t|
- FileUtils.rm_rf t.gem_clone_dir, { :verbose => $verbose }
+ FileUtils.rm_rf t.gem_clone_dir
end
puts "Cleaned up mrbgems build folder"
end
|