|
@@ -903,9 +903,9 @@ fi
|
|
: ${install=${INSTALL-install}}
|
|
: ${install=${INSTALL-install}}
|
|
# We prefer python 3.x. A bare 'python' is traditionally
|
|
# We prefer python 3.x. A bare 'python' is traditionally
|
|
# python 2.x, but some distros have it as python 3.x, so
|
|
# python 2.x, but some distros have it as python 3.x, so
|
|
-# we check that before python2
|
|
|
|
|
|
+# we check that too
|
|
python=
|
|
python=
|
|
-for binary in "${PYTHON-python3}" python python2
|
|
|
|
|
|
+for binary in "${PYTHON-python3}" python
|
|
do
|
|
do
|
|
if has "$binary"
|
|
if has "$binary"
|
|
then
|
|
then
|
|
@@ -1842,8 +1842,8 @@ fi
|
|
|
|
|
|
# Note that if the Python conditional here evaluates True we will exit
|
|
# Note that if the Python conditional here evaluates True we will exit
|
|
# with status 1 which is a shell 'false' value.
|
|
# with status 1 which is a shell 'false' value.
|
|
-if ! $python -c 'import sys; sys.exit(sys.version_info < (2,7))'; then
|
|
|
|
- error_exit "Cannot use '$python', Python 2 >= 2.7 or Python 3 is required." \
|
|
|
|
|
|
+if ! $python -c 'import sys; sys.exit(sys.version_info < (3,5))'; then
|
|
|
|
+ error_exit "Cannot use '$python', Python >= 3.5 is required." \
|
|
"Use --python=/path/to/python to specify a supported Python."
|
|
"Use --python=/path/to/python to specify a supported Python."
|
|
fi
|
|
fi
|
|
|
|
|
|
@@ -6594,15 +6594,6 @@ if test "$supported_os" = "no"; then
|
|
echo "us upstream at qemu-devel@nongnu.org."
|
|
echo "us upstream at qemu-devel@nongnu.org."
|
|
fi
|
|
fi
|
|
|
|
|
|
-# Note that if the Python conditional here evaluates True we will exit
|
|
|
|
-# with status 1 which is a shell 'false' value.
|
|
|
|
-if ! $python -c 'import sys; sys.exit(sys.version_info < (3,0))'; then
|
|
|
|
- echo
|
|
|
|
- echo "warning: Python 2 support is deprecated" >&2
|
|
|
|
- echo "warning: Python 3 will be required for building future versions of QEMU" >&2
|
|
|
|
- python2="y"
|
|
|
|
-fi
|
|
|
|
-
|
|
|
|
config_host_mak="config-host.mak"
|
|
config_host_mak="config-host.mak"
|
|
|
|
|
|
echo "# Automatically generated by configure - do not modify" >config-all-disas.mak
|
|
echo "# Automatically generated by configure - do not modify" >config-all-disas.mak
|
|
@@ -7447,7 +7438,6 @@ echo "INSTALL_DATA=$install -c -m 0644" >> $config_host_mak
|
|
echo "INSTALL_PROG=$install -c -m 0755" >> $config_host_mak
|
|
echo "INSTALL_PROG=$install -c -m 0755" >> $config_host_mak
|
|
echo "INSTALL_LIB=$install -c -m 0644" >> $config_host_mak
|
|
echo "INSTALL_LIB=$install -c -m 0644" >> $config_host_mak
|
|
echo "PYTHON=$python" >> $config_host_mak
|
|
echo "PYTHON=$python" >> $config_host_mak
|
|
-echo "PYTHON2=$python2" >> $config_host_mak
|
|
|
|
echo "CC=$cc" >> $config_host_mak
|
|
echo "CC=$cc" >> $config_host_mak
|
|
if $iasl -h > /dev/null 2>&1; then
|
|
if $iasl -h > /dev/null 2>&1; then
|
|
echo "IASL=$iasl" >> $config_host_mak
|
|
echo "IASL=$iasl" >> $config_host_mak
|