From 6933c65bc3835f69f2c774c7d27c8ebcd05d55d6 Mon Sep 17 00:00:00 2001 From: wangjinlei Date: Thu, 24 Nov 2022 14:54:20 +0800 Subject: [PATCH 1/2] configure: Remove unused python_version variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Shellcheck correctly reports that we set python_version and never use it. This is a leftover from commit f9332757898a7: we used to use python_version purely to as part of the summary information printed at the end of a configure run, and that commit changed to printing the information from meson (which looks up the python version itself). Remove the unused variable. Signed-off-by: Peter Maydell Reviewed-by: Marc-André Lureau Reviewed-by: Philippe Mathieu-Daudé Message-id: 20220825150703.4074125-2-peter.maydell@linaro.org Signed-off-by: wangjinlei --- configure | 3 --- 1 file changed, 3 deletions(-) diff --git a/configure b/configure index 0ae7bcf065..e12ef3d842 100755 --- a/configure +++ b/configure @@ -1498,9 +1498,6 @@ if ! $python -c 'import sys; sys.exit(sys.version_info < (3,6))'; then "Use --python=/path/to/python to specify a supported Python." fi -# Preserve python version since some functionality is dependent on it -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) - # Suppress writing compiled files python="$python -B" -- Gitee From 280fca570579e659aa38def7f55151eea4f42712 Mon Sep 17 00:00:00 2001 From: wangjinlei Date: Thu, 24 Nov 2022 15:38:49 +0800 Subject: [PATCH 2/2] configure: Remove unused meson_args variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The meson_args variable was added in commit 3b4da13293482134b, but was not used in that commit and isn't used today. Delete the unnecessary assignment. Signed-off-by: Peter Maydell Reviewed-by: Marc-André Lureau Reviewed-by: Philippe Mathieu-Daudé Message-id: 20220825150703.4074125-3-peter.maydell@linaro.org Signed-off-by: wangjinlei --- configure | 1 - 1 file changed, 1 deletion(-) diff --git a/configure b/configure index e12ef3d842..8cbf186296 100755 --- a/configure +++ b/configure @@ -361,7 +361,6 @@ plugins="$default_feature" rng_none="no" secret_keyring="$default_feature" meson="" -meson_args="" ninja="" gio="$default_feature" skip_meson=no -- Gitee