ruby-changes:60603
From: Nobuyoshi <ko1@a...>
Date: Tue, 31 Mar 2020 17:37:19 +0900 (JST)
Subject: [ruby-changes:60603] 03ca90c732 (master): Share download cache with bundler
https://git.ruby-lang.org/ruby.git/commit/?id=03ca90c732 From 03ca90c732d4e2369d907d3b1b8d641ff4345f5a Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Tue, 31 Mar 2020 17:36:52 +0900 Subject: Share download cache with bundler diff --git a/defs/gmake.mk b/defs/gmake.mk index cd72c49..0b9d47a 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -248,6 +248,12 @@ BUNDLED_GEMS := $(shell sed 's/[ ][ ]*/-/;s/[ ].*//' $(srcdir)/gems/bundled_g https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L248 update-gems: | $(patsubst %,gems/%.gem,$(BUNDLED_GEMS)) +test-bundler-precheck: | $(srcdir)/.bundle/cache + +$(srcdir)/.bundle/cache: + $(MAKEDIRS) $(@D) + $(LN_S) ../.downloaded-cache $@ + gems/%.gem: $(ECHO) Downloading bundled gem $*... $(Q) $(BASERUBY) -C "$(srcdir)" \ diff --git a/template/Makefile.in b/template/Makefile.in index c527834..a3b067b 100644 --- a/template/Makefile.in +++ b/template/Makefile.in @@ -206,6 +206,7 @@ RM = rm -f https://github.com/ruby/ruby/blob/trunk/template/Makefile.in#L206 RMDIR = @RMDIR@ RMDIRS = @RMDIRS@ RMALL = @RMALL@ +LN_S = @LN_S@ NM = @NM@ AR = @AR@ ARFLAGS = @ARFLAGS@$(empty) -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/