[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 731731: target/s390x: fix meson.build issue
|
From: |
Peter Maydell |
|
Subject: |
[Qemu-commits] [qemu/qemu] 731731: target/s390x: fix meson.build issue |
|
Date: |
Sat, 22 Aug 2020 16:00:24 -0700 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: 73173177ac672925dd6c6bf6bd00386fb753fc4b
https://github.com/qemu/qemu/commit/73173177ac672925dd6c6bf6bd00386fb753fc4b
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2020-08-21 (Fri, 21 Aug 2020)
Changed paths:
M target/s390x/meson.build
Log Message:
-----------
target/s390x: fix meson.build issue
files() is needed to avoid
../meson.build:977:2: ERROR: File tcg-stub.c does not exist.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 6dd93c2bde99ab4ec066d696b121fdc0188d9856
https://github.com/qemu/qemu/commit/6dd93c2bde99ab4ec066d696b121fdc0188d9856
Author: Stefano Garzarella <sgarzare@redhat.com>
Date: 2020-08-21 (Fri, 21 Aug 2020)
Changed paths:
M util/meson.build
Log Message:
-----------
util/meson.build: fix fdmon-io_uring build
libqemuutil.a build fails with this error:
/usr/bin/ld: libqemuutil.a(util_fdmon-io_uring.c.o): in function `get_sqe':
qemu/build/../util/fdmon-io_uring.c:83: undefined reference to
`io_uring_get_sqe'
/usr/bin/ld: qemu/build/../util/fdmon-io_uring.c:92: undefined reference to
`io_uring_submit'
/usr/bin/ld: qemu/build/../util/fdmon-io_uring.c:96: undefined reference to
`io_uring_get_sqe'
/usr/bin/ld: libqemuutil.a(util_fdmon-io_uring.c.o): in function
`fdmon_io_uring_wait':
qemu/build/../util/fdmon-io_uring.c:289: undefined reference to
`io_uring_submit_and_wait'
/usr/bin/ld: libqemuutil.a(util_fdmon-io_uring.c.o): in function
`fdmon_io_uring_setup':
qemu/build/../util/fdmon-io_uring.c:328: undefined reference to
`io_uring_queue_init'
/usr/bin/ld: libqemuutil.a(util_fdmon-io_uring.c.o): in function
`fdmon_io_uring_destroy':
qemu/build/../util/fdmon-io_uring.c:343: undefined reference to
`io_uring_queue_exit'
collect2: error: ld returned 1 exit status
This patch fix the issue adding 'linux_io_uring' dependency for
fdmon-io_uring.c
Fixes: a81df1b68b ("libqemuutil, qapi, trace: convert to meson")
Cc: pbonzini@redhat.com
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Message-Id: <20200821154853.94379-1-sgarzare@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: c44a33e2fe0688b323a5a8c76852f286fc02be9f
https://github.com/qemu/qemu/commit/c44a33e2fe0688b323a5a8c76852f286fc02be9f
Author: Stefano Garzarella <sgarzare@redhat.com>
Date: 2020-08-21 (Fri, 21 Aug 2020)
Changed paths:
M configure
Log Message:
-----------
configure: silence 'shift' error message in version_ge()
If there are less than 2 arguments in version_ge(), the second
'shift' prints this error:
../configure: line 232: shift: shift count out of range
As Eric suggested, we can use 'shift ${2:+2}' which works out to
'shift 2' if $2 is set, or 'shift' (implicitly shift 1) if $2
is not set.
This patch replaces both 'shift; shift' occurrences in version_ge()
with 'shift ${2:+2}'.
Suggested-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200821203558.10338-1-sgarzare@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 28742467c9c0bd49f594bfd46ecca5e6398ddb12
https://github.com/qemu/qemu/commit/28742467c9c0bd49f594bfd46ecca5e6398ddb12
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: 2020-08-21 (Fri, 21 Aug 2020)
Changed paths:
M Makefile
M meson.build
A pc-bios/keymaps/.gitignore
R pc-bios/keymaps/Makefile
A pc-bios/keymaps/meson.build
M pc-bios/meson.build
M ui/meson.build
Log Message:
-----------
meson: convert pc-bios/keymaps/Makefile
Note that sl and sv keymaps were not created by qemu-keymap.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 8855e8f0465d449efe96733e1d4bcf6e5cb54d1c
https://github.com/qemu/qemu/commit/8855e8f0465d449efe96733e1d4bcf6e5cb54d1c
Author: Philippe Mathieu-Daudé <philmd@redhat.com>
Date: 2020-08-21 (Fri, 21 Aug 2020)
Changed paths:
M meson.build
Log Message:
-----------
meson: Fix --disable-tools --enable-system builds
Fixes:
$ ../configure --disable-tools --disable-user
../tests/qemu-iotests/meson.build:7:0: ERROR: Unknown variable
"qemu_block_tools".
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200821150556.1235625-1-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 460b4664c6ad2b88ccfb2d69ab4cbb7d6c9165a0
https://github.com/qemu/qemu/commit/460b4664c6ad2b88ccfb2d69ab4cbb7d6c9165a0
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2020-08-21 (Fri, 21 Aug 2020)
Changed paths:
M pc-bios/keymaps/ar
M pc-bios/keymaps/bepo
M pc-bios/keymaps/cz
M pc-bios/keymaps/da
M pc-bios/keymaps/de
M pc-bios/keymaps/de-ch
M pc-bios/keymaps/en-gb
M pc-bios/keymaps/en-us
M pc-bios/keymaps/es
M pc-bios/keymaps/et
M pc-bios/keymaps/fi
M pc-bios/keymaps/fo
M pc-bios/keymaps/fr
M pc-bios/keymaps/fr-be
M pc-bios/keymaps/fr-ca
M pc-bios/keymaps/fr-ch
M pc-bios/keymaps/hr
M pc-bios/keymaps/hu
M pc-bios/keymaps/is
M pc-bios/keymaps/it
M pc-bios/keymaps/ja
M pc-bios/keymaps/lt
M pc-bios/keymaps/lv
M pc-bios/keymaps/mk
M pc-bios/keymaps/nl
M pc-bios/keymaps/no
M pc-bios/keymaps/pl
M pc-bios/keymaps/pt
M pc-bios/keymaps/pt-br
M pc-bios/keymaps/ru
M pc-bios/keymaps/th
M pc-bios/keymaps/tr
Log Message:
-----------
keymaps: update
Looks like update-keymaps has not been run in a while.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 3a52b42c949ddd6ebb9f7e86ad83243bd1d52d9e
https://github.com/qemu/qemu/commit/3a52b42c949ddd6ebb9f7e86ad83243bd1d52d9e
Author: Peter Maydell <peter.maydell@linaro.org>
Date: 2020-08-22 (Sat, 22 Aug 2020)
Changed paths:
M Makefile
M configure
M meson.build
A pc-bios/keymaps/.gitignore
R pc-bios/keymaps/Makefile
M pc-bios/keymaps/ar
M pc-bios/keymaps/bepo
M pc-bios/keymaps/cz
M pc-bios/keymaps/da
M pc-bios/keymaps/de
M pc-bios/keymaps/de-ch
M pc-bios/keymaps/en-gb
M pc-bios/keymaps/en-us
M pc-bios/keymaps/es
M pc-bios/keymaps/et
M pc-bios/keymaps/fi
M pc-bios/keymaps/fo
M pc-bios/keymaps/fr
M pc-bios/keymaps/fr-be
M pc-bios/keymaps/fr-ca
M pc-bios/keymaps/fr-ch
M pc-bios/keymaps/hr
M pc-bios/keymaps/hu
M pc-bios/keymaps/is
M pc-bios/keymaps/it
M pc-bios/keymaps/ja
M pc-bios/keymaps/lt
M pc-bios/keymaps/lv
A pc-bios/keymaps/meson.build
M pc-bios/keymaps/mk
M pc-bios/keymaps/nl
M pc-bios/keymaps/no
M pc-bios/keymaps/pl
M pc-bios/keymaps/pt
M pc-bios/keymaps/pt-br
M pc-bios/keymaps/ru
M pc-bios/keymaps/th
M pc-bios/keymaps/tr
M pc-bios/meson.build
M target/s390x/meson.build
M ui/meson.build
M util/meson.build
Log Message:
-----------
Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into
staging
meson fixes:
* --disable-tools --enable-system build
* s390 no-TCG build
* fdmon-io_uring
* 'shift' error message in version_ge()
# gpg: Signature made Fri 21 Aug 2020 22:12:29 BST
# gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg: issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini-gitlab/tags/for-upstream:
keymaps: update
meson: Fix --disable-tools --enable-system builds
meson: convert pc-bios/keymaps/Makefile
configure: silence 'shift' error message in version_ge()
util/meson.build: fix fdmon-io_uring build
target/s390x: fix meson.build issue
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Compare: https://github.com/qemu/qemu/compare/66e01f1cdc96...3a52b42c949d
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [qemu/qemu] 731731: target/s390x: fix meson.build issue,
Peter Maydell <=