Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
build/make/Makefile.in: Replace 'SPKG-clean' by 'SPKG-uninstall', wit…
Browse files Browse the repository at this point in the history
…h deprecation, for pip packages too
  • Loading branch information
Matthias Koeppe committed Sep 24, 2020
1 parent 81a63df commit 3d6fa59
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions build/make/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ debug-check:
# <pkgname>: <dependencies>
# $(AM_V_at)sage-logger -p 'sage --pip install ...' '$(SAGE_LOGS)/<pkgname>.log'
#
# <pkgname>-clean:
# <pkgname>-uninstall:
# -sage --pip uninstall -y ...

# Positional arguments:
Expand All @@ -534,14 +534,17 @@ $(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
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)
Expand Down

0 comments on commit 3d6fa59

Please sign in to comment.