build/make/Makefile.in: Handle SAGE_CHECK... for script packages

sagemath · May 8, 2022 · c264e7f · c264e7f
1 parent 5f311f5
commit c264e7f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/build/make/Makefile.in b/build/make/Makefile.in
@@ -381,7 +381,7 @@ define SET_SAGE_CHECK
 $(eval SAGE_CHECK_$(1) := $(2))
 endef
 # Set defaults
-$(foreach pkgname, $(NORMAL_PACKAGES),\
+$(foreach pkgname, $(NORMAL_PACKAGES) $(SCRIPT_PACKAGES),\
 	$(eval $(call SET_SAGE_CHECK,$(pkgname),$(SAGE_CHECK))))
 
 # Parsing the SAGE_CHECK_PACKAGES variable:
@@ -411,7 +411,7 @@ $(foreach clause, $(SAGE_CHECK_PACKAGES_sep),					\
 	       $(eval $(call SET_SAGE_CHECK,$(subst ?,,$(clause)),warn)),	\
 	       $(eval $(call SET_SAGE_CHECK,$(clause),yes)))))
 debug-check:
-	@echo $(foreach pkgname, $(NORMAL_PACKAGES), SAGE_CHECK_$(pkgname) = $(SAGE_CHECK_$(pkgname)))
+	@echo $(foreach pkgname, $(NORMAL_PACKAGES) $(SCRIPT_PACKAGES), SAGE_CHECK_$(pkgname) = $(SAGE_CHECK_$(pkgname)))
 
 
 #==============================================================================
@@ -623,7 +623,7 @@ $(1)-$(4)-no-deps:
 		. '$$(SAGE_ROOT)/build/bin/sage-build-env' && \
 		SAGE_SPKG_WHEELS=$$($(4))/var/lib/sage/wheels \
 		SAGE_INST_LOCAL=$$($(4)) \
-		sage-logger -p '$$(SAGE_ROOT)/build/pkgs/$(1)/spkg-install' '$$(SAGE_LOGS)/$(1)-$(2).log' && \
+		sage-logger -p 'SAGE_CHECK=$$(SAGE_CHECK_$(1)) $$(SAGE_ROOT)/build/pkgs/$(1)/spkg-install' '$$(SAGE_LOGS)/$(1)-$(2).log' && \
 	    touch "$$($(4))/$(SPKG_INST_RELDIR)/$(1)-$(2)"; \
 	else \
 	    echo; \