1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed installation failure [Bug #17191]

Browse Source 
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.
This commit is contained in:
Nobuyoshi Nakada 2020-09-29 13:41:59 +09:00
parent b971f141b2
commit a9ff390870
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.mk
View File

@ -1296,7 +1296,7 @@ update-config_files: PHONY
config.guess config.sub config.guess config.sub
refresh-gems: update-bundled_gems prepare-gems 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 update-gems$(gnumake:yes=-nongnumake): PHONY
$(ECHO) Downloading bundled gem files... $(ECHO) Downloading bundled gem files...

2
defs/gmake.mk
View File

@ -246,7 +246,7 @@ HELP_EXTRA_TASKS = \
" update-github: merge master branch and push it to Pull Request [PR=1234]" \ " 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) BUNDLED_GEMS := $(shell sed '/^[ ]*\#/d;/^[ ]*$$/d;s/[ ][ ]*/-/;s/[ ].*//' $(srcdir)/gems/bundled_gems)