From 8fa7fe17aea61d3359999a09f6e421d5ee046574 Mon Sep 17 00:00:00 2001 From: Jordi Mallach Date: Wed, 27 Jan 2021 19:26:13 +0100 Subject: [PATCH] do not assume python points to python3. Origin: Debian Forwarded: no Gbp-Pq: Name python3.patch --- makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/makefile b/makefile index 537d9eb74..6ca6f5ac8 100644 --- a/makefile +++ b/makefile @@ -449,7 +449,7 @@ endif endif ifndef PYTHON_EXECUTABLE -PYTHON := python +PYTHON := python3 else PYTHON := $(PYTHON_EXECUTABLE) endif @@ -1000,12 +1000,12 @@ ifeq ($(OS),windows) ifeq (posix,$(SHELLTYPE)) GCC_VERSION := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) -dumpversion 2> /dev/null) CLANG_VERSION := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) --version 2> /dev/null| head -n 1 | grep clang | sed "s/^.*[^0-9]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$$/\1/" | head -n 1) -PYTHON_AVAILABLE := $(shell $(PYTHON) --version > /dev/null 2>&1 && echo python) +PYTHON_AVAILABLE := $(shell $(PYTHON) --version > /dev/null 2>&1 && echo python3) GIT_AVAILABLE := $(shell git --version > /dev/null 2>&1 && echo git) else GCC_VERSION := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) -dumpversion 2> NUL) CLANG_VERSION := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) --version 2> NUL| head -n 1 | grep clang | sed "s/^.*[^0-9]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$$/\1/" | head -n 1) -PYTHON_AVAILABLE := $(shell $(PYTHON) --version > NUL 2>&1 && echo python) +PYTHON_AVAILABLE := $(shell $(PYTHON) --version > NUL 2>&1 && echo python3) GIT_AVAILABLE := $(shell git --version > NUL 2>&1 && echo git) endif ifdef MSBUILD @@ -1048,7 +1048,7 @@ CLANG_VERSION := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) -v 2>&1 >/dev/null | else CLANG_VERSION := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) --version 2> /dev/null | head -n 1 | grep -e 'version [0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?' -o | grep -e '[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?' -o | tail -n 1) endif -PYTHON_AVAILABLE := $(shell $(PYTHON) --version > /dev/null 2>&1 && echo python) +PYTHON_AVAILABLE := $(shell $(PYTHON) --version > /dev/null 2>&1 && echo python3) GIT_AVAILABLE := $(shell git --version > /dev/null 2>&1 && echo git) endif @@ -1069,7 +1069,7 @@ endif endif endif -ifneq ($(PYTHON_AVAILABLE),python) +ifneq ($(PYTHON_AVAILABLE),python3) $(error Python is not available in path) endif -- 2.30.2