From 17f5631c6ea118b9ce0e8776dc50c7b1dcdaf596 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Wed, 18 Jan 2023 20:36:31 +0900
Subject: [Bug #19340] Fix bundle gems with test revision

Build temporary gem package from cloned repository if test revision is
set.
---
 defs/gmake.mk | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'defs')

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) $@
-- 
cgit v1.2.1