All of lore.kernel.org
 help / color / mirror / Atom feed
* [Qemu-trivial] [PATCH (1.7?)] configure: Use -B switch only for Python versions which support it
@ 2013-11-14 18:07 ` Stefan Weil
  0 siblings, 0 replies; 18+ messages in thread
From: Stefan Weil @ 2013-11-14 18:07 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, Stefan Weil, Stefan Hajnoczi

Commit 1d984a67a95d88f3e708b077dab8adeb47c38c93 added the -B switch
unconditionally. This breaks Python versions before 2.6 which don't
support that switch.

Now configure adds -B only if it is accepted by the Python interpreter.

This modification introduces a small incompatiblity because -B might now
also be added when configure was called with --python=PYTHON_INTERPRETER.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 configure |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

This is an optional patch. We need it for Python versions older than 5 years
if we don't want to use the workaround --python=python.

I don't think it is needed for 1.7, but maybe other people think different.

Stefan

diff --git a/configure b/configure
index 9a02610..3c25816 100755
--- a/configure
+++ b/configure
@@ -593,7 +593,7 @@ fi
 
 : ${make=${MAKE-make}}
 : ${install=${INSTALL-install}}
-: ${python=${PYTHON-python -B}}
+: ${python=${PYTHON-python}}
 : ${smbd=${SMBD-/usr/sbin/smbd}}
 
 # Default objcc to clang if available, otherwise use CC
@@ -1420,6 +1420,13 @@ if ! $python -c 'import sys; sys.exit(sys.version_info < (2,4) or sys.version_in
       "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



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

end of thread, other threads:[~2013-11-16 13:14 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-14 18:07 [Qemu-trivial] [PATCH (1.7?)] configure: Use -B switch only for Python versions which support it Stefan Weil
2013-11-14 18:07 ` [Qemu-devel] " Stefan Weil
2013-11-14 18:13 ` [Qemu-trivial] " Stefan Weil
2013-11-14 18:13   ` [Qemu-devel] " Stefan Weil
2013-11-14 18:17 ` [Qemu-trivial] " Peter Maydell
2013-11-14 18:17   ` Peter Maydell
2013-11-15  9:19 ` [Qemu-trivial] " Stefan Hajnoczi
2013-11-15  9:19   ` [Qemu-devel] " Stefan Hajnoczi
2013-11-16 10:07 ` [Qemu-trivial] " Michael Tokarev
2013-11-16 10:07   ` [Qemu-devel] " Michael Tokarev
2013-11-16 11:10   ` [Qemu-trivial] [Qemu-devel] " Peter Maydell
2013-11-16 11:10     ` [Qemu-devel] [Qemu-trivial] " Peter Maydell
2013-11-16 11:45     ` [Qemu-trivial] [Qemu-devel] " Michael Tokarev
2013-11-16 11:45       ` [Qemu-devel] [Qemu-trivial] " Michael Tokarev
2013-11-16 11:49       ` [Qemu-trivial] [Qemu-devel] " Peter Maydell
2013-11-16 11:49         ` [Qemu-devel] [Qemu-trivial] " Peter Maydell
2013-11-16 13:14 ` Stefan Weil
2013-11-16 13:14   ` [Qemu-devel] " Stefan Weil

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.