drop no longer used ruby(ver)

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

diff --git a/strip-ccache.patch b/strip-ccache.patch
index 763516bcacebc5fb6026bef373170c3d82b7ca79..b9ee410c1a6be73ce46499bba2fd9c7309a9f682 100644 (file)
--- a/strip-ccache.patch
+++ b/strip-ccache.patch
@@ -1,12 +1,39 @@
-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.2.5/tool/mkconfig.rb.orig   2016-09-19 13:53:05.152982868 +0200
++++ ruby-2.2.5/tool/mkconfig.rb        2016-09-19 14:01:04.182988081 +0200
+@@ -79,6 +79,7 @@
+     when /^LIBRUBY_D?LD/; next
+     when /^RUBY_INSTALL_NAME$/; next vars[name] = (install_name = val).dup if $install_name
+     when /^RUBY_SO_NAME$/; next vars[name] = (so_name = val).dup 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
+--- ruby-2.2.5/common.mk.orig  2016-03-29 23:07:26.000000000 +0200
++++ ruby-2.2.5/common.mk       2016-09-19 14:02:16.189655531 +0200
+@@ -186,7 +186,7 @@
+ configure-ext: $(EXTS_MK)
+ 
+ build-ext: $(EXTS_MK)
+-      $(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) \
++      $(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) CC="$(CC)" \
+           ENCOBJS="$(ENCOBJS)" UPDATE_LIBRARIES=no $(EXTSTATIC)
+ 
+ prog: program wprogram
+@@ -598,7 +598,7 @@
+       $(ECHO) making $@
+       $(Q) $(MAKE) -f $(ENC_MK) V="$(V)" \
+               RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" \
+-              $(MFLAGS) $@
++              $(MFLAGS) CC="$(CC)" $@
+ 
+ 
+ libenc enc: {$(VPATH)}encdb.h
+@@ -737,7 +737,7 @@
+ 
+ srcs-enc: $(ENC_MK)
+       $(ECHO) making srcs under enc
+-      $(Q) $(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) srcs
++      $(Q) $(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" CC="$(CC)" $(MFLAGS) srcs
+ 
+ all-incs: incs {$(VPATH)}encdb.h {$(VPATH)}transdb.h
+ incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}known_errors.inc \