strip ccache from CC and CXX in rbconfig.rb

diff --git a/ruby.spec b/ruby.spec
index ebe8427911f37189091df2d3c04c2617fcc48fcd..d4f6554dab577b3c8a1f8e432a6d95489aac25bb 100644 (file)
--- a/ruby.spec
+++ b/ruby.spec
@@ -60,6 +60,7 @@ Patch4:               arch-specific-dir.patch
 Patch5:                site-and-vendor-arch-flags.patch
 # Make mkmf verbose by default
 Patch6:                mkmf-verbose.patch
+Patch7:                strip-ccache.patch
 URL:           http://www.ruby-lang.org/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
@@ -397,6 +398,8 @@ Biblioteka JSON dla języka Ruby.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 # must be regenerated with new bison
 %{__rm} parse.{c,h}

diff --git a/strip-ccache.patch b/strip-ccache.patch
new file mode 100644 (file)
index 0000000..763516b
--- /dev/null
+++ b/strip-ccache.patch
@@ -0,0 +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?
++    when /^(CC|CXX)$/; val.sub!(/ccache /, '')
+     end
+     case val
+     when /^\$\(ac_\w+\)$/; next