From: Eduardo Habkost <ehabkost@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>,
qemu-devel@nongnu.org, Cleber Rosa <crosa@redhat.com>
Subject: [Qemu-devel] [PULL 19/19] configure: automatically pick python3 is available
Date: Thu, 2 May 2019 21:41:30 -0300 [thread overview]
Message-ID: <20190503004130.8285-20-ehabkost@redhat.com> (raw)
In-Reply-To: <20190503004130.8285-1-ehabkost@redhat.com>
From: Daniel P. Berrangé <berrange@redhat.com>
Unless overridden via an env var or configure arg, QEMU will only look
for the 'python' binary in $PATH. This is unhelpful on distros which
are only shipping Python 3.x (eg Fedora) in their default install as,
if they comply with PEP 394, the bare 'python' binary won't exist.
This changes configure so that by default it will search for all three
common python binaries, preferring to find Python 3.x versions.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20190327170701.23798-1-berrange@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
configure | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index 60719ddcc5..f88011b94d 100755
--- a/configure
+++ b/configure
@@ -899,7 +899,18 @@ fi
: ${make=${MAKE-make}}
: ${install=${INSTALL-install}}
-: ${python=${PYTHON-python}}
+# We prefer python 3.x. A bare 'python' is traditionally
+# python 2.x, but some distros have it as python 3.x, so
+# we check that before python2
+python=
+for binary in "${PYTHON-python3}" python python2
+do
+ if has "$binary"
+ then
+ python="$binary"
+ break
+ fi
+done
: ${smbd=${SMBD-/usr/sbin/smbd}}
# Default objcc to clang if available, otherwise use CC
@@ -1818,8 +1829,9 @@ EOF
exit 0
fi
-if ! has $python; then
- error_exit "Python not found. Use --python=/path/to/python"
+if test -z "$python"
+then
+ error_exit "Python not found. Use --python=/path/to/python"
fi
# Note that if the Python conditional here evaluates True we will exit
--
2.18.0.rc1.1.g3f1ff2140
next prev parent reply other threads:[~2019-05-03 0:42 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-03 0:41 [Qemu-devel] [PULL 00/19] Python queue, 2019-05-02 Eduardo Habkost
2019-05-03 0:41 ` Eduardo Habkost
2019-05-03 0:41 ` [Qemu-devel] [PULL 01/19] tests/acceptance: show avocado test execution by default Eduardo Habkost
2019-05-03 0:41 ` Eduardo Habkost
2019-05-03 0:41 ` [Qemu-devel] [PULL 02/19] tests/acceptance: improve docstring on pick_default_qemu_bin() Eduardo Habkost
2019-05-03 0:41 ` Eduardo Habkost
2019-05-03 0:41 ` [Qemu-devel] [PULL 03/19] tests/acceptance: fix doc reference to avocado_qemu directory Eduardo Habkost
2019-05-03 0:41 ` Eduardo Habkost
2019-05-03 0:41 ` [Qemu-devel] [PULL 04/19] tests/acceptance: introduce arch parameter and attribute Eduardo Habkost
2019-05-03 0:41 ` Eduardo Habkost
2019-05-03 0:41 ` [Qemu-devel] [PULL 05/19] tests/acceptance: use "arch:" tag to filter target specific tests Eduardo Habkost
2019-05-03 0:41 ` Eduardo Habkost
2019-05-03 0:41 ` [Qemu-devel] [PULL 06/19] tests/acceptance: look for target architecture in test tags first Eduardo Habkost
2019-05-03 0:41 ` Eduardo Habkost
2019-05-03 0:41 ` [Qemu-devel] [PULL 07/19] tests/boot_linux_console: rename the x86_64 after the arch and machine Eduardo Habkost
2019-05-03 0:41 ` Eduardo Habkost
2019-05-03 0:41 ` [Qemu-devel] [PULL 08/19] tests/boot_linux_console: update the x86_64 kernel Eduardo Habkost
2019-05-03 0:41 ` Eduardo Habkost
2019-05-03 0:41 ` [Qemu-devel] [PULL 09/19] tests/boot_linux_console: add common kernel command line options Eduardo Habkost
2019-05-03 0:41 ` Eduardo Habkost
2019-05-03 0:41 ` [Qemu-devel] [PULL 10/19] tests/boot_linux_console: increase timeout Eduardo Habkost
2019-05-03 0:41 ` Eduardo Habkost
2019-05-08 10:28 ` Gerd Hoffmann
2019-05-08 14:39 ` Cleber Rosa
2019-05-09 4:40 ` Gerd Hoffmann
2019-05-09 18:12 ` Cleber Rosa
2019-05-10 6:06 ` Gerd Hoffmann
2019-05-03 0:41 ` [Qemu-devel] [PULL 11/19] tests/boot_linux_console: refactor the console watcher into utility method Eduardo Habkost
2019-05-03 0:41 ` Eduardo Habkost
2019-05-03 0:41 ` [Qemu-devel] [PULL 12/19] scripts/qemu.py: support adding a console with the default serial device Eduardo Habkost
2019-05-03 0:41 ` Eduardo Habkost
2019-05-03 0:41 ` [Qemu-devel] [PULL 13/19] tests/boot_linux_console: add a test for mips + malta Eduardo Habkost
2019-05-03 0:41 ` Eduardo Habkost
2019-05-03 0:41 ` [Qemu-devel] [PULL 14/19] tests/boot_linux_console: add a test for mips64el " Eduardo Habkost
2019-05-03 0:41 ` Eduardo Habkost
2019-05-03 0:41 ` [Qemu-devel] [PULL 15/19] tests/boot_linux_console: add a test for aarch64 + virt Eduardo Habkost
2019-05-03 0:41 ` Eduardo Habkost
2019-05-03 0:41 ` [Qemu-devel] [PULL 16/19] tests/boot_linux_console: add a test for arm " Eduardo Habkost
2019-05-03 0:41 ` Eduardo Habkost
2019-05-03 0:41 ` [Qemu-devel] [PULL 17/19] tests/boot_linux_console: add a test for s390x + s390-ccw-virtio Eduardo Habkost
2019-05-03 0:41 ` Eduardo Habkost
2019-05-03 0:41 ` [Qemu-devel] [PULL 18/19] tests/boot_linux_console: add a test for alpha + clipper Eduardo Habkost
2019-05-03 0:41 ` Eduardo Habkost
2019-05-03 0:41 ` Eduardo Habkost [this message]
2019-05-03 0:41 ` [Qemu-devel] [PULL 19/19] configure: automatically pick python3 is available Eduardo Habkost
2019-05-03 16:41 ` Thomas Huth
2019-05-03 16:41 ` Thomas Huth
2019-05-03 16:54 ` Daniel P. Berrangé
2019-05-03 16:54 ` Daniel P. Berrangé
2019-05-03 16:56 ` Daniel P. Berrangé
2019-05-03 16:56 ` Daniel P. Berrangé
2019-05-03 17:04 ` Philippe Mathieu-Daudé
2019-05-03 17:04 ` Philippe Mathieu-Daudé
2019-05-04 6:41 ` Thomas Huth
2019-05-04 6:41 ` Thomas Huth
2019-05-03 21:00 ` Eduardo Habkost
2019-05-03 21:00 ` Eduardo Habkost
2019-05-03 21:34 ` Eduardo Habkost
2019-05-03 21:34 ` Eduardo Habkost
2019-05-04 7:17 ` Thomas Huth
2019-05-04 7:17 ` Thomas Huth
2019-05-03 15:02 ` [Qemu-devel] [PULL 00/19] Python queue, 2019-05-02 Peter Maydell
2019-05-03 15:02 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190503004130.8285-20-ehabkost@redhat.com \
--to=ehabkost@redhat.com \
--cc=crosa@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).