From 3d6fa5924f54b85a28f5c4d969afca01da8801fc Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 24 Sep 2020 16:38:01 -0700 Subject: [PATCH] build/make/Makefile.in: Replace 'SPKG-clean' by 'SPKG-uninstall', with deprecation, for pip packages too --- build/make/Makefile.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build/make/Makefile.in b/build/make/Makefile.in index 2e77702f546..513ead75f3f 100644 --- a/build/make/Makefile.in +++ b/build/make/Makefile.in @@ -519,7 +519,7 @@ debug-check: # : # $(AM_V_at)sage-logger -p 'sage --pip install ...' '$(SAGE_LOGS)/.log' # -# -clean: +# -uninstall: # -sage --pip uninstall -y ... # Positional arguments: @@ -534,7 +534,7 @@ $(1): $(2) $(1)-no-deps: $(AM_V_at)sage-logger -p 'sage --pip install -r "$$(SAGE_ROOT)/build/pkgs/$(1)/requirements.txt"' '$$(SAGE_LOGS)/$(1).log' -$(1)-clean: +$(1)-uninstall: -sage --pip uninstall -y -r '$$(SAGE_ROOT)/build/pkgs/$(1)/requirements.txt' .PHONY: $(1) $(1)-clean $(1)-build-deps $(1)-no-deps @@ -542,6 +542,9 @@ endef $(foreach pkgname,$(PIP_PACKAGES),\ $(eval $(call PIP_PACKAGE_templ,$(pkgname),$(call pkg_deps,$(pkgname))))) +$(foreach pkgname, $(PIP_PACKAGES),\ + $(eval $(call NORMAL_PACKAGE_clean_templ,$(pkgname),$(vers_$(pkgname)),\ + $(call pkg_deps,$(pkgname))))) ifdef DEBUG_RULES $(info # Rules for pip packages)