[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/17] configure: Python tests must be done before he
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 12/17] configure: Python tests must be done before help message |
Date: |
Sat, 28 Dec 2013 02:07:25 +0400 |
From: Stefan Weil <address@hidden>
The help message uses $python and displays its value, so that macro
should be tested and set early.
With this modification, configure --help displays the correct value
(usually python -B) and no longer creates several *.pyc files.
Signed-off-by: Stefan Weil <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
configure | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/configure b/configure
index 552d865..57fe31e 100755
--- a/configure
+++ b/configure
@@ -1004,6 +1004,25 @@ for opt do
esac
done
+if ! has $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
+# 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." \
+ "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
+
case "$cpu" in
ppc)
CPU_CFLAGS="-m32"
@@ -1419,25 +1438,6 @@ if test "$solaris" = "yes" ; then
fi
fi
-if ! has $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
-# 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." \
- "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
-
if test -z "${target_list+xxx}" ; then
target_list="$default_target_list"
else
--
1.7.10.4
- [Qemu-devel] [PULL 01/17] hw/arm/highbank: Simplify code (memory region in device state), (continued)
- [Qemu-devel] [PULL 01/17] hw/arm/highbank: Simplify code (memory region in device state), Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 05/17] exynos4210: Use macro ARRAY_SIZE where possible, Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 03/17] misc: Use macro ARRAY_SIZE where possible, Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 02/17] openrisc: Fix spelling in comment (transaltion -> translation), Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 07/17] x86: only allow real mode to access 32bit without LMA, Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 08/17] vl: make boot_strict variable static (not used outside vl.c), Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 15/17] pxa27x: Add 'const' attribute to keyboard maps, Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 06/17] linux-user: Use macro TARGET_NSIG_WORDS where possible, Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 11/17] configure: Rewrite code for help message, Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 09/17] fix -boot strict regressed in commit 6ef4716, Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 12/17] configure: Python tests must be done before help message,
Michael Tokarev <=
- [Qemu-devel] [PULL 17/17] acpi unit-test: Remove temporary disk after test, Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 04/17] ui/cocoa: Use macro ARRAY_SIZE where possible, Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 14/17] pxa27x: Reduce size of keyboard matrix mapping, Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 16/17] mainstone: Fix duplicate array values for key 'space', Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 10/17] target-m68k: Replace qemu_assert by hw_error, Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 13/17] doc: Mention chardev:id in available devices for -serial, Michael Tokarev, 2013/12/27