ruby-changes:63196
From: Nobuyoshi <ko1@a...>
Date: Tue, 29 Sep 2020 13:47:53 +0900 (JST)
Subject: [ruby-changes:63196] a9ff390870 (master): Fixed installation failure [Bug #17191]
https://git.ruby-lang.org/ruby.git/commit/?id=a9ff390870 From a9ff39087092b21059fca046ace9ca87770692a4 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Tue, 29 Sep 2020 13:41:59 +0900 Subject: Fixed installation failure [Bug #17191] Try update and extract bundled gems only when baseruby is available. It should be done only when installing from developemental build and not from the tarball, but it is not obvious to differentiate them. diff --git a/common.mk b/common.mk index 603429b..509f09c 100644 --- a/common.mk +++ b/common.mk @@ -1296,7 +1296,7 @@ update-config_files: PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L1296 config.guess config.sub refresh-gems: update-bundled_gems prepare-gems -prepare-gems: update-gems extract-gems +prepare-gems: $(HAVE_BASERUBY:yes=update-gems) $(HAVE_BASERUBY:yes=extract-gems) update-gems$(gnumake:yes=-nongnumake): PHONY $(ECHO) Downloading bundled gem files... diff --git a/defs/gmake.mk b/defs/gmake.mk index 7e9566f..31af44a 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -246,7 +246,7 @@ HELP_EXTRA_TASKS = \ https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L246 " update-github: merge master branch and push it to Pull Request [PR=1234]" \ "" -extract-gems: update-gems +extract-gems: $(HAVE_BASERUBY:yes=update-gems) BUNDLED_GEMS := $(shell sed '/^[ ]*\#/d;/^[ ]*$$/d;s/[ ][ ]*/-/;s/[ ].*//' $(srcdir)/gems/bundled_gems) -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/