Skip to content

Commit 0aaf02e

Browse files
author
Matthias Koeppe
committed
build/make/Makefile.in (SCRIPT_PACKAGE_templ) [SAGE_CHECK=yes]: Call script spkg-postinstcheck if it exists; new target SPKG-check
1 parent f91c20b commit 0aaf02e

File tree

1 file changed

+22
-1
lines changed

1 file changed

+22
-1
lines changed

build/make/Makefile.in

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,8 @@ $(1)-$(4)-no-deps:
737737
SAGE_SPKG_WHEELS=$$($(4))/var/lib/sage/wheels \
738738
SAGE_SPKG_SCRIPTS=$$($(4))/var/lib/sage/scripts \
739739
SAGE_INST_LOCAL=$$($(4)) \
740-
sage-logger -p 'SAGE_CHECK=$$(SAGE_CHECK_$(1)) $$(SAGE_ROOT)/build/pkgs/$(1)/spkg-install' '$$(SAGE_LOGS)/$(1)-$(2).log' && \
740+
SAGE_CHECK=$$(SAGE_CHECK_$(1)) \
741+
sage-logger -p '$$(SAGE_ROOT)/build/pkgs/$(1)/spkg-install && if [ $$$$SAGE_CHECK != no -a -x $$(SAGE_ROOT)/build/pkgs/$(1)/spkg-postinstcheck ]; then $$(SAGE_ROOT)/build/pkgs/$(1)/spkg-postinstcheck; fi' '$$(SAGE_LOGS)/$(1)-$(2).log' && \
741742
rm -f "$$($(4))/$(SPKG_INST_RELDIR)/$(1)"-* && \
742743
touch "$$($(4))/$(SPKG_INST_RELDIR)/$(1)-$(2)"; \
743744
else ( \
@@ -757,6 +758,26 @@ $(1)-$(4)-no-deps:
757758

758759
$(1)-no-deps: $(1)-$(4)-no-deps
759760

761+
$(1)-$(4)-check:
762+
$(PLUS)@if [ -x $$(SAGE_ROOT)/build/pkgs/$(1)/spkg-postinstcheck ]; then \
763+
cd '$$(SAGE_ROOT)/build/pkgs/$(1)' && \
764+
. '$$(SAGE_ROOT)/src/bin/sage-src-env-config' && \
765+
. '$$(SAGE_ROOT)/src/bin/sage-env-config' && \
766+
. '$$(SAGE_ROOT)/src/bin/sage-env' && \
767+
. '$$(SAGE_ROOT)/build/bin/sage-build-env-config' && \
768+
. '$$(SAGE_ROOT)/build/bin/sage-build-env' && \
769+
PKG_BASE="$(1)" \
770+
PKG_VER="$(2)" \
771+
PKG_NAME="$(1)-$(2)" \
772+
SAGE_SPKG_WHEELS=$$($(4))/var/lib/sage/wheels \
773+
SAGE_SPKG_SCRIPTS=$$($(4))/var/lib/sage/scripts \
774+
SAGE_INST_LOCAL=$$($(4)) \
775+
SAGE_CHECK=$$(SAGE_CHECK_$(1)) \
776+
sage-logger -p '$$(SAGE_ROOT)/build/pkgs/$(1)/spkg-postinstcheck' '$$(SAGE_LOGS)/$(1)-$(2).log'; \
777+
fi
778+
779+
$(1)-check: $(1)-$(4)-check
780+
760781
$(1)-$(4)-uninstall:
761782
-$(AM_V_at)cd '$$(SAGE_ROOT)/build/pkgs/$(1)' && \
762783
. '$$(SAGE_ROOT)/src/bin/sage-src-env-config' && \

0 commit comments

Comments
 (0)