From: Jordi Mallach Date: Wed, 20 Dec 2023 17:34:35 +0000 (+0100) Subject: do not assume python points to python3. X-Git-Tag: archive/raspbian/0.266+dfsg.1-1+rpi1~1^2~7 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bcc5fac3bd4f7d67f8ea3ebdb45d4121dca51cec;p=mame.git do not assume python points to python3. Origin: Debian Forwarded: no Gbp-Pq: Name python3.patch --- diff --git a/makefile b/makefile index db8c2f2fb..b18256f52 100644 --- a/makefile +++ b/makefile @@ -1022,7 +1022,7 @@ GIT_AVAILABLE := $(shell git --version > /dev/null 2>&1 && echo git) else GCC_VERSION := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) -dumpfullversion 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 @@ -1052,7 +1052,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 @@ -1073,7 +1073,7 @@ endif endif endif -ifneq ($(PYTHON_AVAILABLE),python) +ifneq ($(PYTHON_AVAILABLE),python3) $(error Python is not available in path) endif