Skip to contentSkip to conversation

configure: more resilient Python version capture

PATCH Superseded Cleber Rosa 3 participants 4 messages Aug 23, 2019 – Aug 26, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 configure: more resilient Python version capture

The current approach to capture the Python version is fragile, as it was demonstrated by a very specific build of Python 3 on Fedora 29 that, under non-interactive shells would print multiline version information.

The (badly) stripped version output would be sent to config-host.mak, producing bad syntax and rendering the makefiles unusable. Now, the Python versions is printed by configure, but only a simple (and better controlled variable) indicating whether the build system is using Python 2 is kept on config-host.mak.

---
 configure              | 5 +++--
 tests/Makefile.include | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)
configure +3 -2
index e44e454c43..90b29037ab 100755
@@ -1864,7 +1864,7 @@ if ! $python -c 'import sys; sys.exit(sys.version_info < (2,7))'; then
 fi
 
 # Preserve python version since some functionality is dependent on it
-python_version=$($python -V 2>&1 | sed -e 's/Python\ //')
+python_version=$(python2 -c 'import sys; print("%d.%d.%d" % (sys.version_info[0], sys.version_info[1], sys.version_info[2]))' 2>/dev/null)
 
 # Suppress writing compiled files
 python="$python -B"
@@ -6511,6 +6511,7 @@ 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"
@@ -7333,7 +7334,7 @@ echo "INSTALL_DATA=$install -c -m 0644" >> $config_host_mak
 echo "INSTALL_PROG=$install -c -m 0755" >> $config_host_mak
 echo "INSTALL_LIB=$install -c -m 0644" >> $config_host_mak
 echo "PYTHON=$python" >> $config_host_mak
-echo "PYTHON_VERSION=$python_version" >> $config_host_mak
+echo "PYTHON2=$python2" >> $config_host_mak
 echo "CC=$cc" >> $config_host_mak
 if $iasl -h > /dev/null 2>&1; then
   echo "IASL=$iasl" >> $config_host_mak
tests/Makefile.include +1 -1
index 49684fd4f4..f5ac09549c 100644
@@ -1135,7 +1135,7 @@ TESTS_RESULTS_DIR=$(BUILD_DIR)/tests/results
 AVOCADO_SHOW=app
 AVOCADO_TAGS=$(patsubst %-softmmu,-t arch:%, $(filter %-softmmu,$(TARGET_DIRS)))
 
-ifneq ($(findstring v2,"v$(PYTHON_VERSION)"),v2)
+ifneq ($(PYTHON2),y)
 $(TESTS_VENV_DIR): $(TESTS_VENV_REQ)
 	$(call quiet-command, \
             $(PYTHON) -m venv --system-site-packages $@, \
Signature · 1 line
2.21.0
#1 lore raw

configure if ! $python -c 'import sys; sys.exit(sys.version_info < (2,7))'; then · line 1867

Quoted 2 lines
configure +1 -1
-python_version=$($python -V 2>&1 | sed -e 's/Python\ //')
+python_version=$(python2 -c 'import sys; print("%d.%d.%d" % (sys.version_info[0], sys.version_info[1], sys.version_info[2]))' 2>/dev/null)

On a Python 3 only system, configure will no longer print the version.

e.g.
/* snip */

install           install
python            python3 -B ()
slirp support     git 

/* snip */

Quoted 6 lines
configure +1 -0
@@ -6511,6 +6511,7 @@ 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  

...

Quoted 2 lines
configure +1 -1
-echo "PYTHON_VERSION=$python_version" >> $config_host_mak
+echo "PYTHON2=$python2" >> $config_host_mak

...

tests/Makefile.include TESTS_RESULTS_DIR=$(BUILD_DIR)/tests/results · line 1138

Quoted 2 lines
tests/Makefile.include +1 -1
-ifneq ($(findstring v2,"v$(PYTHON_VERSION)"),v2)
+ifneq ($(PYTHON2),y)

Succinctly, if Python 3.

We can further ween the world off Python 2 by replacing python2="y" for python3="y" and PYTHON2 for PYTHON3.

#2 lore raw
Quoted 10 lines · On Sat, 24 Aug 2019 at 08:32, <[email protected]> wrote:
Quoted 2 lines
configure +1 -1
-echo "PYTHON_VERSION=$python_version" >> $config_host_mak
+echo "PYTHON2=$python2" >> $config_host_mak

...

tests/Makefile.include TESTS_RESULTS_DIR=$(BUILD_DIR)/tests/results · line 1138

Quoted 2 lines
tests/Makefile.include +1 -1
-ifneq ($(findstring v2,"v$(PYTHON_VERSION)"),v2)
+ifneq ($(PYTHON2),y)

Succinctly, if Python 3.

We can further ween the world off Python 2 by replacing python2="y" for python3="y" and PYTHON2 for PYTHON3.

I don't think it's a big deal which way round we do this, because once we drop Python 2 support the if and the variable will just be deleted entirely.

thanks
-- PMM

#3 lore raw
In reply to [email protected]
Quoted 5 lines · On Sat, Aug 24, 2019 at 07:32:24AM +0000, [email protected] wrote:

configure if ! $python -c 'import sys; sys.exit(sys.version_info < (2,7))'; then · line 1867

Quoted 2 lines
configure +1 -1
-python_version=$($python -V 2>&1 | sed -e 's/Python\ //')
+python_version=$(python2 -c 'import sys; print("%d.%d.%d" % (sys.version_info[0], sys.version_info[1], sys.version_info[2]))' 2>/dev/null)

On a Python 3 only system, configure will no longer print the version.

Oh my, this is not what I intended... gross late Friday mistake. I meant:

python_version=$($python -c 'import sys; print("%d.%d.%d" % (sys.version_info[0], sys.version_info[1], sys.version_info[2]))' 2>/dev/null)

- Cleber.