[Qemu-devel] [PATCH] configure: Require Python 2.6

* [Qemu-devel] [PATCH] configure: Require Python 2.6
@ 2015-09-04 19:53 Markus Armbruster
  2015-09-04 22:44 ` Peter Maydell
  2015-09-07  8:50 ` Daniel P. Berrange
  0 siblings, 2 replies; 10+ messages in thread
From: Markus Armbruster @ 2015-09-04 19:53 UTC (permalink / raw)
  To: qemu-devel; +Cc: pbonzini, peter.maydell

RHEL-6 and SLES-11 provide Python 2.6.  It'll also work on OS X back
to 10.6.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 configure | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/configure b/configure
index 21c4089..bce1769 100755
--- a/configure
+++ b/configure
@@ -1157,18 +1157,14 @@ 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 < (2,4) or sys.version_info >= (3,))'; then
-  error_exit "Cannot use '$python', Python 2.4 or later is required." \
+if ! $python -c 'import sys; sys.exit(sys.version_info < (2,6) or sys.version_info >= (3,))'; then
+  error_exit "Cannot use '$python', Python 2.6 or later is required." \
       "Note that Python 3 or later is not yet supported." \
       "Use --python=/path/to/python to specify a supported Python."
 fi
 
-# The -B switch was added in Python 2.6.
-# If it is supplied, compiled files are not written.
-# Use it for Python versions which support it.
-if $python -B -c 'import sys; sys.exit(0)' 2>/dev/null; then
-  python="$python -B"
-fi
+# Suppress writing compiled files
+python="$python -B"
 
 case "$cpu" in
     ppc)
-- 
2.4.3

^ permalink raw reply related	[flat|nested] 10+ messages in thread