From 515854a19f9ac3070d254bbac540b05d32fb152e Mon Sep 17 00:00:00 2001 From: Sebastian Sumpf Date: Tue, 17 Jan 2023 15:03:22 +0100 Subject: [PATCH] tool/depot: adapt to .NOPARALLEL changes in GNU make 4.4 The semantic of .NOPARALLEL has changed in GNU Make 4.4 Quote: New feature: .NOTPARALLEL accepts prerequisites If the .NOTPARALLEL special target has prerequisites then all prerequisites of those targets will be run serially (as if .WAIT was specified between each prerequisite). This means that only prerequisites are made sequential. Before everything within a Makefile would be done in sequential order. Therefore, we had to add the *.hash target (appears multiple times) to the .NOPARALLEL prerequisites. issue #4725 --- tool/depot/mk/extract_content.inc | 2 +- tool/depot/mk/extract_pkg_archive | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tool/depot/mk/extract_content.inc b/tool/depot/mk/extract_content.inc index 002930c6e0..918f5c9d9a 100644 --- a/tool/depot/mk/extract_content.inc +++ b/tool/depot/mk/extract_content.inc @@ -38,7 +38,7 @@ $(TARGET) $(DEPOT_ARCHIVE_DIR)/$(TAG_FILE): checked_content_mk_exists # triggered as soon as the specific tag file appears but before the entire # sub make is finished with populating the archive directory. # -.NOTPARALLEL: $(DEPOT_ARCHIVE_DIR)/$(TAG_FILE) +.NOTPARALLEL: $(DEPOT_ARCHIVE_DIR)/$(TAG_FILE) $(DEPOT_ARCHIVE_DIR).hash # # Assemble archive content by invoking the recipe's content.mk file diff --git a/tool/depot/mk/extract_pkg_archive b/tool/depot/mk/extract_pkg_archive index 75a1b256c6..398beb6a2e 100755 --- a/tool/depot/mk/extract_pkg_archive +++ b/tool/depot/mk/extract_pkg_archive @@ -77,7 +77,7 @@ ifeq ($(filter $(RECIPE_FILES),runtime),runtime) $(VERBOSE)xmllint --noout $(addprefix $(RECIPE_DIR)/,runtime) endif -.NOTPARALLEL: $(DEPOT_ARCHIVE_DIR)/$(TAG_FILE) +.NOTPARALLEL: $(DEPOT_ARCHIVE_DIR)/$(TAG_FILE) $(DEPOT_ARCHIVE_DIR).hash $(DEPOT_ARCHIVE_DIR)/$(TAG_FILE): checked_readme_exists checked_runtime_valid $(VERBOSE)cp $(addprefix $(RECIPE_DIR)/,$(RECIPE_FILES)) $(DEPOT_ARCHIVE_DIR)/ @@ -85,7 +85,7 @@ $(DEPOT_ARCHIVE_DIR)/$(TAG_FILE): checked_readme_exists checked_runtime_valid # # Replace the '_' marker in the 'archives' list with the actual user name # -$(DEPOT_ARCHIVE_DIR)/archives: $(DEPOT_ARCHIVE_DIR).hash $(DEPOT_ARCHIVE_DIR)/_archives +$(DEPOT_ARCHIVE_DIR)/archives: $(DEPOT_ARCHIVE_DIR).hash $(VERBOSE)sed "s/^_/$(USER)/" $(DEPOT_ARCHIVE_DIR)/_archives > $@ $(VERBOSE)rm -f $(DEPOT_ARCHIVE_DIR)/_archives