From aa11c86249eebca9d4ea20a9cd9fb1cef6cb94b9 Mon Sep 17 00:00:00 2001 From: Lauri Tirkkonen Date: Sun, 6 Jan 2019 02:57:07 +0200 Subject: [PATCH] ips.mk: add deps on 'install' to rules that need it this allows to use parallel make for each component (including jobserver) --- make-rules/ips.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make-rules/ips.mk b/make-rules/ips.mk index 427cc0a3c..7c38242d9 100644 --- a/make-rules/ips.mk +++ b/make-rules/ips.mk @@ -323,7 +323,7 @@ $(MANIFEST_BASE)-%.p5m: %-RUBYVER.p5m $(BUILD_DIR)/mkgeneric-ruby ifeq ($(strip $(COMPONENT_AUTOGEN_MANIFEST)),yes) # auto-generate file/directory list -$(MANIFEST_BASE)-%.generated: %.p5m $(BUILD_DIR) +$(MANIFEST_BASE)-%.generated: %.p5m $(BUILD_DIR) install (cat $(METADATA_TEMPLATE); \ $(PKGSEND) generate $(PKG_HARDLINKS:%=--target %) $(PROTO_DIR)) | \ $(PKGMOGRIFY) $(PKG_OPTIONS) /dev/fd/0 $(AUTOGEN_MANIFEST_TRANSFORMS) | \ @@ -360,7 +360,7 @@ $(BUILD_DIR): # generate dependencies PKGDEPEND_GENERATE_OPTIONS = -m $(PKG_PROTO_DIRS:%=-d %) -$(MANIFEST_BASE)-%.depend: $(MANIFEST_BASE)-%.mogrified +$(MANIFEST_BASE)-%.depend: $(MANIFEST_BASE)-%.mogrified install $(PKGDEPEND) generate $(PKGDEPEND_GENERATE_OPTIONS) $< >$@ # These files should contain a list of packages that the component is known to -- 2.11.4.GIT