1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
Author: Jordi Mallach <jordi@debian.org>
Description: do not assume python points to python3.
Origin: Debian
Forwarded: no
Index: mame/makefile
===================================================================
--- mame.orig/makefile
+++ mame/makefile
@@ -1006,7 +1006,7 @@ GIT_AVAILABLE := $(shell git --versio
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
@@ -1036,7 +1036,7 @@ CLANG_VERSION := $(shell $(TOOLCHAIN)
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
@@ -1055,7 +1055,7 @@ endif
endif # asmjs
endif # CLANG_VERSION
-ifneq ($(PYTHON_AVAILABLE),python)
+ifneq ($(PYTHON_AVAILABLE),python3)
$(error Python is not available in path)
endif
|
