mirror of https://github.com/xemu-project/xemu.git
configure improvements and fixes
MAINTAINERS update -----BEGIN PGP SIGNATURE----- iQJGBAABCAAwFiEEzS913cjjpNwuT1Fz8ww4vT8vvjwFAl0Tz0ISHGxhdXJlbnRA dml2aWVyLmV1AAoJEPMMOL0/L7480D4QAJLK8xf0fhB+RR1fcBS1lrxNWvbTkYTQ kptVaWUTUYYnvMQbCLsgYYtna3W1zZxhgZKMQcAy7fLzj5wOM+MjalOHLjYHFIxH PEYtZt4urJoj0nmZbQVjO7s3Z1Asd5Lwnu9ylCtxBvai1pGxZGNbPfnxwkDRlGP6 q73XiA2tsi0bmbevV4q15tshJvcPo1yskxPAsNb91YnUEbsE8/09HDOezgAvB2+7 tR5k66aNEidqtISlQcm6ct215+tRA9lz4wz5gWn5UA0AJFUmDLq96DhgrkL/+l8H +N9cq3lw4P+ZFG5ufKbNV1qzDEDPuU1S6xycRg/c53q/UPle9MyZkRHrm0Ml/x5g Ro7MkqDEx1TwhkzoMhycDPD1grUFTOP6efiys+t4Z7lWvnhp4/q6FPblaX69wBvd rhDRO3Du11387ByEmsYINLsvMDdlee8WqrGUSk0BYHqoSFs6QnP/YSHryRfV3zkE iDROxxoQKqonpLrPHTPP6Jj0j0cBR36Th5wbq0uQPYXWg27ZBe9BI09ZKOnzFSbx JTMJxQ9VNaBeiOUTcqsZ85PIWzwzRKvdWlQPKJEe88ARrUWY4oXe0lJ2kjR+8/Lo lA+CE9eQJ+t8LdwuSWe5Hb3s492J3YCG2X/i1E2TZymoP0zaeEcDWwAMBlH2YZgc s5XLbPqHaTDe =UxmJ -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/vivier2/tags/trivial-patches-pull-request' into staging configure improvements and fixes MAINTAINERS update # gpg: Signature made Wed 26 Jun 2019 21:02:10 BST # gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C # gpg: issuer "laurent@vivier.eu" # gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full] # gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full] # gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full] # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C * remotes/vivier2/tags/trivial-patches-pull-request: MAINTAINERS: Change maintership of Xen code under hw/9pfs configure: use valid args testing sem_timedwait configure: disallow spaces and colons in source path and build path configure: set source_path only once and make its definition more robust Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
7d0e02405f
|
@ -408,7 +408,7 @@ M: Paul Durrant <paul.durrant@citrix.com>
|
|||
L: xen-devel@lists.xenproject.org
|
||||
S: Supported
|
||||
F: */xen*
|
||||
F: hw/9pfs/xen-9p-backend.c
|
||||
F: hw/9pfs/xen-9p*
|
||||
F: hw/char/xen_console.c
|
||||
F: hw/display/xenfb.c
|
||||
F: hw/net/xen_nic.c
|
||||
|
@ -1498,6 +1498,7 @@ virtio-9p
|
|||
M: Greg Kurz <groug@kaod.org>
|
||||
S: Supported
|
||||
F: hw/9pfs/
|
||||
X: hw/9pfs/xen-9p*
|
||||
F: fsdev/
|
||||
F: tests/virtio-9p-test.c
|
||||
T: git https://github.com/gkurz/qemu.git 9p-next
|
||||
|
|
4
Makefile
4
Makefile
|
@ -1,5 +1,9 @@
|
|||
# Makefile for QEMU.
|
||||
|
||||
ifneq ($(words $(subst :, ,$(CURDIR))), 1)
|
||||
$(error main directory cannot contain spaces nor colons)
|
||||
endif
|
||||
|
||||
# Always point to the root of the build tree (needs GNU make).
|
||||
BUILD_DIR=$(CURDIR)
|
||||
|
||||
|
|
|
@ -276,10 +276,15 @@ ld_has() {
|
|||
$ld --help 2>/dev/null | grep ".$1" >/dev/null 2>&1
|
||||
}
|
||||
|
||||
# default parameters
|
||||
source_path=$(dirname "$0")
|
||||
# make source path absolute
|
||||
source_path=$(cd "$source_path"; pwd)
|
||||
source_path=$(cd "$(dirname -- "$0")"; pwd)
|
||||
|
||||
if printf %s\\n "$source_path" "$PWD" | grep -q "[[:space:]:]";
|
||||
then
|
||||
error_exit "main directory cannot contain spaces nor colons"
|
||||
fi
|
||||
|
||||
# default parameters
|
||||
cpu=""
|
||||
iasl="iasl"
|
||||
interp_prefix="/usr/gnemul/qemu-%M"
|
||||
|
@ -5130,7 +5135,7 @@ fi
|
|||
sem_timedwait=no
|
||||
cat > $TMPC << EOF
|
||||
#include <semaphore.h>
|
||||
int main(void) { return sem_timedwait(0, 0); }
|
||||
int main(void) { sem_t s; struct timespec t = {0}; return sem_timedwait(&s, &t); }
|
||||
EOF
|
||||
if compile_prog "" "" ; then
|
||||
sem_timedwait=yes
|
||||
|
|
Loading…
Reference in New Issue