From c83f1f699ce698a4ec6a42ca61f43802ca6f19b3 Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Sat, 12 Aug 2023 22:58:35 -0700 Subject: [PATCH] Makefile: do not use --copies when creating git-cola.app Some python installations (eg. ones created with relocatable-python on macOS) hit errors when using --copies. $ make git-cola.app mkdir -p git-cola.app/Contents/MacOS mkdir -p git-cola.app/Contents/Resources python3 -m venv --copies git-cola.app/Contents/Resources Error: Command '[ 'git-cola.app/Contents/Resources/bin/python3', '-Im', 'ensurepip', '--upgrade', '--default-pip' ]' died with . make: *** [git-cola.app] Error 1 Remove this flag for now. Signed-off-by: David Aguilar --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5d999b10..79815e95 100644 --- a/Makefile +++ b/Makefile @@ -233,7 +233,7 @@ git-cola.app:: git-cola.app:: $(MKDIR_P) $(cola_app)/Contents/MacOS $(MKDIR_P) $(cola_app_resources) - $(PYTHON3) -m venv --copies $(cola_app_resources) + $(PYTHON3) -m venv $(cola_app_resources) $(cola_app_resources)/bin/pip install --requirement requirements/requirements.txt $(cola_app_resources)/bin/pip install --requirement requirements/requirements-optional.txt $(cola_app_resources)/bin/pip install --requirement requirements/requirements-dev.txt -- 2.11.4.GIT