@@ -30,7 +30,7 @@ PYLINT_RC ?= .pylintrc
3030TEST_FOLDER ?= ./tests
3131TEST ?= .
3232
33−VTENV_OPTS ?=
33+VTENV_OPTS = "--no-site-packages"
3434PY_ENV = ./local/py$(PY)
3535PY_ENV_BIN = $(PY_ENV)/bin
3636PY_ENV_ACT = . $(PY_ENV_BIN)/activate
@@ -41,6 +41,20 @@ ifeq ($(OS),Windows_NT)
4141 PY_ENV_ACT = $(PY_ENV_BIN)/activate
4242endif
4343
44+ifeq ($(PYTHON),python)
45+ VIRTUALENV = virtualenv
46+else
47+ VIRTUALENV = virtualenv --python=$(PYTHON)
48+endif
49+
50+ifeq ($(KBUILD_VERBOSE),1)
51+ PIP_VERBOSE =
52+ VIRTUALENV_VERBOSE =
53+else
54+ PIP_VERBOSE = "-q"
55+ VIRTUALENV_VERBOSE = "-q"
56+endif
57+
4458python-help::
4559 @echo 'makefile.python:'
4660 @echo ' pyenv | pyenv[un]install'
@@ -108,16 +122,13 @@ quiet_cmd_pyenvuninstall = PYENV uninstall $2
108122 cmd_pyenvuninstall = $(PY_ENV_BIN)/python -m pip $(PIP_VERBOSE) uninstall --yes $2
109123
110124# $2 path to folder where virtualenv take place
111−# creating a virtualenv uses $(PYTHON) from the OS!
112125quiet_cmd_virtualenv = PYENV usage: $ source ./$@/bin/activate
113126 cmd_virtualenv = \
114− if [ ! -d "$(PY_ENV)" ];then \
115− echo "PYENV create virtualenv $2"; \
116− $(PYTHON) -m venv $(VTENV_OPTS) $2; \
127+ if [ ! -d "./$(PY_ENV)" ];then \
128+ $(VIRTUALENV) $(VIRTUALENV_VERBOSE) $(VTENV_OPTS) $2; \
117129 else \
118130 echo "PYENV using virtualenv from $2"; \
119− fi; \
120− echo "commands available at $(PY_ENV_BIN):"; ls $(PY_ENV_BIN) | $(FMT) ;
131+ fi
121132
122133# $2 path to lint
123134quiet_cmd_pylint = LINT $@