- reverted version patch to use RUBY_LIB_VERSION_STYLE=2 (minor)

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

diff --git a/strip-ccache.patch b/strip-ccache.patch
index 801ee3c2e5d17b378657c660e1dfd93a259d3718..8c5528bf43481076c2df7a9895edd93b0ce4340f 100644 (file)
--- a/strip-ccache.patch
+++ b/strip-ccache.patch
@@ -8,32 +8,3 @@
      when /^arch$/; if val.empty? then val = arch else arch = val end
      when /^sitearch$/; val = '$(arch)' if val.empty?
      end
---- ruby-2.2.7/common.mk~      2017-04-19 20:22:53.000000000 +0300
-+++ ruby-2.2.7/common.mk       2017-04-19 20:23:24.847180464 +0300
-@@ -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)" \
-           EXTENCS="$(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 \