[packages/ruby/dev-2.0: 21/21] pass CC to submakes as we have stripped ccache from it
glen
glen at pld-linux.org
Fri Apr 18 02:25:04 CEST 2014
commit 44b97f26f94a3604b2a6245c5945f5c385a54cb9
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat Apr 5 16:49:07 2014 +0300
pass CC to submakes as we have stripped ccache from it
strip-ccache.patch | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
---
diff --git a/strip-ccache.patch b/strip-ccache.patch
index 1858e06..456a100 100644
--- a/strip-ccache.patch
+++ b/strip-ccache.patch
@@ -1,4 +1,5 @@
strip ccache from CC and CXX from rbconfig.rb
+as a side effect, we need to pass CC to sub-makes
--- 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
@@ -10,3 +11,32 @@ strip ccache from CC and CXX from rbconfig.rb
when /^arch$/; if val.empty? then val = arch else arch = val end
when /^sitearch$/; val = '$(arch)' if val.empty?
end
+--- ruby-2.0.0-p451/common.mk 2014-04-05 16:16:52.983112032 +0300
++++ ruby-2.0.0-p451/common.mk 2014-04-05 16:26:58.679843426 +0300
+@@ -176,7 +176,7 @@
+ configure-ext: $(EXTS_MK)
+
+ build-ext: $(EXTS_MK)
+- $(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) $(EXTSTATIC) LIBRUBY_EXTS=$(LIBRUBY_EXTS) ENCOBJS="$(ENCOBJS)"
++ $(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) $(EXTSTATIC) LIBRUBY_EXTS=$(LIBRUBY_EXTS) ENCOBJS="$(ENCOBJS)" CC="$(CC)"
+
+ $(MKMAIN_CMD): $(MKFILES) all-incs $(PREP) $(RBCONFIG) $(LIBRUBY)
+ $(Q)$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" --command-output=$@ $(EXTMK_ARGS)
+@@ -545,7 +545,7 @@
+ $(ECHO) making $@
+ $(Q) $(MAKE) -f $(ENC_MK) V="$(V)" \
+ RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" \
+- $(MFLAGS) $@
++ $(MFLAGS) CC="$(CC)" $@
+
+
+ libenc enc: {$(VPATH)}encdb.h
+@@ -860,7 +860,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
+ incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}encdb.h {$(VPATH)}transdb.h {$(VPATH)}known_errors.inc \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ruby.git/commitdiff/44b97f26f94a3604b2a6245c5945f5c385a54cb9
More information about the pld-cvs-commit
mailing list