diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2023-01-18 20:36:31 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2023-01-26 12:50:39 +0900 |
| commit | 17f5631c6ea118b9ce0e8776dc50c7b1dcdaf596 (patch) | |
| tree | 93cc91fcdd336690d7d7e3862fa02415f4f4cce1 /defs | |
| parent | 78fcc9847a9db6d42c8c263154ec05903a370b6b (diff) | |
| download | ruby-17f5631c6ea118b9ce0e8776dc50c7b1dcdaf596.tar.gz | |
[Bug #19340] Fix bundle gems with test revision
Build temporary gem package from cloned repository if test revision is
set.
Diffstat (limited to 'defs')
| -rw-r--r-- | defs/gmake.mk | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/defs/gmake.mk b/defs/gmake.mk index 2f0bc8b810..3970409f39 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -326,27 +326,28 @@ $(srcdir)/.bundle/gems/%: $(srcdir)/gems/%.gem | .bundle/gems -Itool/lib -rbundled_gem \ -e 'BundledGem.unpack("gems/$(@F).gem", ".bundle")' -define copy-gem +define build-gem $(srcdir)/gems/src/$(1): | $(srcdir)/gems/src $(ECHO) Cloning $(4) $(Q) $(GIT) clone $(4) $$(@) -$(srcdir)/.bundle/gems/$(1)-$(2): | $(srcdir)/gems/src/$(1) .bundle/gems - $(ECHO) Copying $(1)@$(3) to $$(@F) +.PHONY: $(srcdir)/gems/$(1)-$(2).gem +$(srcdir)/gems/$(1)-$(2).gem: | $(srcdir)/gems/src/$(1) + $(ECHO) Building $(1)@$(3) to $$(@F) $(Q) $(CHDIR) "$(srcdir)/gems/src/$(1)" && \ $(GIT) fetch origin $(3) && \ $(GIT) checkout --detach $(3) && \ : $(Q) $(BASERUBY) -C "$(srcdir)" \ -Itool/lib -rbundled_gem \ - -e 'BundledGem.copy("gems/src/$(1)/$(1).gemspec", ".bundle")' + -e 'BundledGem.build("gems/src/$(1)/$(1).gemspec", "$(2)", "gems")' endef -define copy-gem-0 -$(eval $(call copy-gem,$(1),$(2),$(3),$(4))) +define build-gem-0 +$(eval $(call build-gem,$(1),$(2),$(3),$(4))) endef -$(call foreach-bundled-gems-rev,copy-gem-0) +$(call foreach-bundled-gems-rev,build-gem-0) $(srcdir)/gems/src: $(MAKEDIRS) $@ |