commit dirty 2.0.0.353

[packages/ruby.git] / strip-ccache.patch

diff --git a/strip-ccache.patch b/strip-ccache.patch
index 763516bcacebc5fb6026bef373170c3d82b7ca79..1858e067e2e13282df7623e2b868a5597a8d0eb6 100644 (file)
--- a/strip-ccache.patch
+++ b/strip-ccache.patch
@@ -1,12 +1,12 @@
 strip ccache from CC and CXX from rbconfig.rb
 
---- ruby-1.9.3-p429/tool/mkconfig.rb~  2013-06-27 19:03:54.455442002 +0300
-+++ ruby-1.9.3-p429/tool/mkconfig.rb   2013-06-27 19:03:25.464126000 +0300
-@@ -85,6 +85,7 @@
-     when /^sitearchdir$/; sitearchdir_override = val; next
-     when /^vendorarchdir$/; vendorarchdir_override = val; next
-     when /^sitearch/; val = '$(arch)' if val.empty?
+--- ruby-2.0.0-p353/tool/mkconfig.rb~  2013-03-24 17:42:06.000000000 +0200
++++ ruby-2.0.0-p353/tool/mkconfig.rb   2014-03-18 10:34:08.489251715 +0200
+@@ -77,6 +77,7 @@
+     when /^(?:MAJOR|MINOR|TEENY)$/; next
+     when /^RUBY_INSTALL_NAME$/; next if $install_name
+     when /^RUBY_SO_NAME$/; next if $so_name
 +    when /^(CC|CXX)$/; val.sub!(/ccache /, '')
+     when /^arch$/; if val.empty? then val = arch else arch = val end
+     when /^sitearch$/; val = '$(arch)' if val.empty?
      end
-     case val
-     when /^\$\(ac_\w+\)$/; next