mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-08 10:13:56 -06:00
Merge remote-tracking branch 'mjt/trivial-patches' into staging
# By Jan Krupa (4) and others # Via Michael Tokarev * mjt/trivial-patches: hw/i386/Makefile.obj: use $(PYTHON) to run .py scripts consistently configure: Use -B switch only for Python versions which support it qga: Fix shutdown command of guest agent to work with SysV console: Remove unused debug code qga: Fix compilation for old versions of MinGW .travis.yml: basic compile and check recipes pci-assign: Fix error_report of pci-stub message qapi: Fix comment for create-type to match code. vl: fix build when configured with no graphic support usb: drop unused USBNetState.inpkt field qemu-char: add missing characters used in keymaps qemu-char: add support for U-prefixed symbols qemu-char: add Czech keymap file qemu-char: add Czech characters to VNC keysyms Message-id: 1384684850-6777-1-git-send-email-mjt@msgid.tls.msk.ru Signed-off-by: Anthony Liguori <aliguori@amazon.com>
This commit is contained in:
commit
38dc74907e
13 changed files with 573 additions and 58 deletions
9
configure
vendored
9
configure
vendored
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue