From: Elan Ruusamäe Date: Thu, 27 Jun 2013 16:04:39 +0000 (+0300) Subject: strip ccache from CC and CXX in rbconfig.rb X-Git-Tag: auto/th/ruby-1.9.3.448-1~2 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=87688b1050b5d2c95ba9671774e6a00a3c765681;p=packages%2Fruby.git strip ccache from CC and CXX in rbconfig.rb --- diff --git a/ruby.spec b/ruby.spec index ebe8427..d4f6554 100644 --- 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 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