From: Jordi Mallach Date: Sun, 6 Apr 2025 14:23:13 +0000 (+0200) Subject: do not assume python points to python3. X-Git-Tag: archive/raspbian/0.276+dfsg.1-1+rpi1^2~6 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1cd2e7777f3abcb30f86bac353f5d8fa377a7e5e;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 a54d254c1..8fc7a231c 100644 --- a/makefile +++ b/makefile @@ -1043,7 +1043,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 @@ -1073,7 +1073,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 @@ -1094,7 +1094,7 @@ endif endif endif -ifneq ($(PYTHON_AVAILABLE),python) +ifneq ($(PYTHON_AVAILABLE),python3) $(error Python is not available in path) endif