[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 465044: meson: bump submodule to 0.55.1
|
From: |
Peter Maydell |
|
Subject: |
[Qemu-commits] [qemu/qemu] 465044: meson: bump submodule to 0.55.1 |
|
Date: |
Wed, 02 Sep 2020 06:00:33 -0700 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: 46504430e6b1f96ca8d805117ee4e20b74544c9f
https://github.com/qemu/qemu/commit/46504430e6b1f96ca8d805117ee4e20b74544c9f
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2020-09-01 (Tue, 01 Sep 2020)
Changed paths:
M configure
M meson
Log Message:
-----------
meson: bump submodule to 0.55.1
This version includes an important bugfix to avoid including unnecessary
-Wl,-rpath flags. It also avoids the warnings on custom_targets with
more than one output.
Reported-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Tested-by: Laurent Vivier <lvivier@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: a10c8516ed59c1e4c0db9b0d9050960ed861703d
https://github.com/qemu/qemu/commit/a10c8516ed59c1e4c0db9b0d9050960ed861703d
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2020-09-01 (Tue, 01 Sep 2020)
Changed paths:
M block/meson.build
Log Message:
-----------
block: always link with zlib
The qcow2 driver needs the zlib dependency. While emulators
provided it through the migration code, this is not true of
the tools. Move the dependency from the qcow1 rule directly
into block_ss so that it is included unconditionally.
Fixes build with --disable-qcow1.
Reported-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Cc: qemu-block@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 7161a43395c19206f1536b94b72cf7a90677275b
https://github.com/qemu/qemu/commit/7161a43395c19206f1536b94b72cf7a90677275b
Author: Volker Rümelin <vr_qemu@t-online.de>
Date: 2020-09-01 (Tue, 01 Sep 2020)
Changed paths:
M meson.build
Log Message:
-----------
meson: fix SDL2_image detection
Configure used to probe for SDL2_image in sdl_image_probe (). Meson
should do the same.
This fixes the following error on my system:
Run-time dependency sdl2 found: YES 2.0.8
Found CMake: /usr/bin/cmake (3.17.0)
Run-time dependency sdl-image found: NO (tried pkgconfig and cmake)
../qemu-master/meson.build:256:2: ERROR: Dependency "sdl-image" not
found, tried pkgconfig and cmake
A full log can be found at /home/ruemelin/rpmbuild/BUILD
/qemu-5.1.50-build/meson-logs/meson-log.txt
ERROR: meson setup failed
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Message-Id: <20200829104158.7461-1-vr_qemu@t-online.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: b17cf893ef1d1eeadc78ae3a265b302b759fd5c6
https://github.com/qemu/qemu/commit/b17cf893ef1d1eeadc78ae3a265b302b759fd5c6
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: 2020-09-01 (Tue, 01 Sep 2020)
Changed paths:
M Makefile
M pc-bios/meson.build
Log Message:
-----------
meson: install pc-bios blobs
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200826130622.553318-2-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: f5aa6320e83b0e8c1a14fd464b1fe6243c20b6d5
https://github.com/qemu/qemu/commit/f5aa6320e83b0e8c1a14fd464b1fe6243c20b6d5
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: 2020-09-01 (Tue, 01 Sep 2020)
Changed paths:
M Makefile
M meson.build
A scripts/meson.build
Log Message:
-----------
meson: install scripts/qemu-trace-stap
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200826130622.553318-3-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: a4d88926c6d37aed583e59c72f9074bc77c0b683
https://github.com/qemu/qemu/commit/a4d88926c6d37aed583e59c72f9074bc77c0b683
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: 2020-09-01 (Tue, 01 Sep 2020)
Changed paths:
M Makefile
A ui/icons/meson.build
M ui/meson.build
Log Message:
-----------
meson: install icons
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200826130622.553318-4-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: c04c071f40c4ce96049848e4fc3b60c961502b81
https://github.com/qemu/qemu/commit/c04c071f40c4ce96049848e4fc3b60c961502b81
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: 2020-09-01 (Tue, 01 Sep 2020)
Changed paths:
M Makefile
M ui/meson.build
Log Message:
-----------
meson: install desktop file
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200826130622.553318-5-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 8ab1aabc5d33a09ceee1adc1148f62cbb16cb43d
https://github.com/qemu/qemu/commit/8ab1aabc5d33a09ceee1adc1148f62cbb16cb43d
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: 2020-09-01 (Tue, 01 Sep 2020)
Changed paths:
M Makefile
M qga/meson.build
Log Message:
-----------
meson: install $localstatedir/run for qga
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200826130622.553318-6-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 771f0fb8c59a0d229909b92cd8ce0284de2f2325
https://github.com/qemu/qemu/commit/771f0fb8c59a0d229909b92cd8ce0284de2f2325
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: 2020-09-01 (Tue, 01 Sep 2020)
Changed paths:
M Makefile
Log Message:
-----------
build-sys: remove install target from Makefile
Now covered by meson
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200826130622.553318-7-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 1ffb3bbb3cb1273a2ad17599dbe82f9c8d3682a2
https://github.com/qemu/qemu/commit/1ffb3bbb3cb1273a2ad17599dbe82f9c8d3682a2
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2020-09-01 (Tue, 01 Sep 2020)
Changed paths:
M configure
M meson.build
Log Message:
-----------
meson: move zlib detection to meson
Meson includes the same logic that tries to look for -lz if
pkg-config (and cmake) cannot find zlib. The undocumented
--disable-zlib-test option becomes a no-op.
There is still an instance of "-lz" in the LIBS directory.
It will go away as soon as tests are converted to meson,
because the zlib dependency does not propagate from libblock.fa
to the Makefile-build unit tests.
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 77433a5fef35de9ac636a1f36dc1fad2855baa5e
https://github.com/qemu/qemu/commit/77433a5fef35de9ac636a1f36dc1fad2855baa5e
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: 2020-09-01 (Tue, 01 Sep 2020)
Changed paths:
M configure
Log Message:
-----------
configure: rename confsuffix option
The value is used to construct conf/mod/data directories.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200826110419.528931-2-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 10ff82d1ffb894d0bcd0e895afe903b9790b7d56
https://github.com/qemu/qemu/commit/10ff82d1ffb894d0bcd0e895afe903b9790b7d56
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: 2020-09-01 (Tue, 01 Sep 2020)
Changed paths:
M configure
Log Message:
-----------
configure: always /-seperate directory from qemu_suffix
Otherwise, we may accept very strange directory names...
While at it, quote the variables.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200826110419.528931-3-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: ca8c0909f013cc15fdff2edf8bbd38ffa8385550
https://github.com/qemu/qemu/commit/ca8c0909f013cc15fdff2edf8bbd38ffa8385550
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: 2020-09-01 (Tue, 01 Sep 2020)
Changed paths:
M configure
Log Message:
-----------
configure: build docdir like other suffixed directories
As documented in --help for --docdir.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200826110419.528931-4-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 73f3aa3766e64492559e3ec05b5cc2cfde0d2c9e
https://github.com/qemu/qemu/commit/73f3aa3766e64492559e3ec05b5cc2cfde0d2c9e
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: 2020-09-01 (Tue, 01 Sep 2020)
Changed paths:
M configure
M meson_options.txt
Log Message:
-----------
meson: pass qemu_suffix option
The following patches will make use of it to fix installation paths.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200826110419.528931-5-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: ab4c0996f80d43d1fc28c6e76f4ecb27423a7e29
https://github.com/qemu/qemu/commit/ab4c0996f80d43d1fc28c6e76f4ecb27423a7e29
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: 2020-09-01 (Tue, 01 Sep 2020)
Changed paths:
M contrib/vhost-user-gpu/meson.build
M meson.build
M meson_options.txt
M pc-bios/descriptors/meson.build
M pc-bios/keymaps/meson.build
M pc-bios/meson.build
M tools/virtiofsd/meson.build
M trace/meson.build
Log Message:
-----------
meson: use meson datadir instead of qemu_datadir
When cross-compiling, by default qemu_datadir is 'c:\Program
Files\QEMU', which is not recognized as being an absolute path, and
meson will end up adding the prefix again.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200826110419.528931-6-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 491e74c158d6bcac3291d2ec354093029169e572
https://github.com/qemu/qemu/commit/491e74c158d6bcac3291d2ec354093029169e572
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: 2020-09-01 (Tue, 01 Sep 2020)
Changed paths:
M configure
M docs/meson.build
M meson.build
M meson_options.txt
Log Message:
-----------
meson: pass docdir option
When cross-compiling, by default qemu_docdir is 'c:\Program Files\QEMU\'
which is not recognized as being an absolute path, and meson will end up
adding the prefix again.
Add an option to pass docdir location to meson, pre-prefixed like we do
with other directories, build qemu_docdir with the common suffix and use
that instead of config_host['qemu_docdir'].
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200826110419.528931-7-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: b81efab7c78777b00c6f385c17a24d19443fe15a
https://github.com/qemu/qemu/commit/b81efab7c78777b00c6f385c17a24d19443fe15a
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: 2020-09-01 (Tue, 01 Sep 2020)
Changed paths:
M configure
M meson.build
Log Message:
-----------
meson: use meson mandir instead of qemu_mandir
When cross-compiling, by default qemu_mandir is 'c:\Program
Files\QEMU', which is not recognized as being an absolute path, and
meson will end up adding the prefix again.
Use the pre-prefixed meson mandir option instead.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200826110419.528931-8-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 8adfeba953e050efb546a92682c15fbddbdac61e
https://github.com/qemu/qemu/commit/8adfeba953e050efb546a92682c15fbddbdac61e
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: 2020-09-01 (Tue, 01 Sep 2020)
Changed paths:
M Makefile
M meson.build
A scripts/nsis.py
Log Message:
-----------
meson: add NSIS building
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20200826110419.528931-9-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: a03e2cd749f1029f21c3ddc8913b0ffa8acd8cb8
https://github.com/qemu/qemu/commit/a03e2cd749f1029f21c3ddc8913b0ffa8acd8cb8
Author: Stefan Weil <sw@weilnetz.de>
Date: 2020-09-01 (Tue, 01 Sep 2020)
Changed paths:
M chardev/meson.build
Log Message:
-----------
meson: add pixman dependency to chardev/baum module
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200830204640.482214-1-sw@weilnetz.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 289e12dbc4864cebf0f64987898ae9da9d0c7839
https://github.com/qemu/qemu/commit/289e12dbc4864cebf0f64987898ae9da9d0c7839
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2020-09-01 (Tue, 01 Sep 2020)
Changed paths:
M ui/meson.build
Log Message:
-----------
meson: add pixman dependency to UI modules
Pixman used to be included directly in QEMU_CFLAGS and therefore the
include path was added to every compiler invocation. Now that (just
like basically everything else) it is a separate dependency, we
need to add it to all build target, especially UI modules that need
it due to their including ui/console.h.
Reported-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 87727cb1d20ebd43dac2e0c90e72be495d0dc72f
https://github.com/qemu/qemu/commit/87727cb1d20ebd43dac2e0c90e72be495d0dc72f
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2020-09-01 (Tue, 01 Sep 2020)
Changed paths:
M configure
Log Message:
-----------
configure: do not include ${prefix} in firmwarepath
Left out in commit 22a87800e6 ("configure: expand path variables for
meson configure", 2020-08-21), do it now.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 1a94933fcc3d641bda9988244cde61769baae2e5
https://github.com/qemu/qemu/commit/1a94933fcc3d641bda9988244cde61769baae2e5
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2020-09-01 (Tue, 01 Sep 2020)
Changed paths:
M docs/devel/build-system.rst
M meson.build
Log Message:
-----------
meson: use pkg-config method to find dependencies
We do not need to ask cmake for the dependencies, so just use the
pkg-config mechanism. Keep "auto" for SDL so that it tries using
sdl-config too.
The documentation is adjusted to use SDL2_image as the example,
rather than SDL which does not use the "pkg-config" method.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 49b7d744266d8bd98544af61cada7fa969ff570d
https://github.com/qemu/qemu/commit/49b7d744266d8bd98544af61cada7fa969ff570d
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2020-09-01 (Tue, 01 Sep 2020)
Changed paths:
M Makefile
M pc-bios/optionrom/Makefile
M pc-bios/s390-ccw/Makefile
Log Message:
-----------
build: fix recurse-all target
The missing "/all" suffix prevents the pc-bios/ parts of the build
from running.
In the meanwhile, -Wall has moved from QEMU_CFLAGS to CFLAGS. Simplify
everything by not passing down CFLAGS, and add -Wall in the recursive
Makefiles.
Reported-by: Miroslav Rezanina <mrezanin@redhat.com>
Reviewed-by: Miroslav Rezanina <mrezanin@redhat.com>
Tested-by: Thomas Huth <thuth@redhat.com>
Fixes: 5e6d1573b4 ("remove Makefile.target", 2020-08-21)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: cb572714f955f5b3396a9219608b12be346f962b
https://github.com/qemu/qemu/commit/cb572714f955f5b3396a9219608b12be346f962b
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2020-09-01 (Tue, 01 Sep 2020)
Changed paths:
M meson_options.txt
Log Message:
-----------
meson: add description to options
This will be useful in the future to generate configure
command line parsing from meson_options.txt.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: d79864058a643671bbed8f587edd893aada928da
https://github.com/qemu/qemu/commit/d79864058a643671bbed8f587edd893aada928da
Author: Greg Kurz <groug@kaod.org>
Date: 2020-09-01 (Tue, 01 Sep 2020)
Changed paths:
M Makefile
Log Message:
-----------
Makefile: Add back TAGS/ctags/cscope rules
It is a bit of a pain to be forced to run configure before being able
to use cscope and friends. Add back the rules to build them in-tree
as before commit a56650518f5b.
Fixes: a56650518f5b ("configure: integrate Meson in the build system")
Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <159897001005.442705.16516671603870288336.stgit@bahia.lan>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 9f5d95976895132976d9d6c14e7a35781d6f1e15
https://github.com/qemu/qemu/commit/9f5d95976895132976d9d6c14e7a35781d6f1e15
Author: Greg Kurz <groug@kaod.org>
Date: 2020-09-01 (Tue, 01 Sep 2020)
Changed paths:
M Makefile
Log Message:
-----------
Makefile: Fix in-tree clean/distclean
Doing 'make clean' or 'make distclean' in a freshly cloned tree results in:
make: *** No rule to make target 'ninja-clean', needed by 'clean'. Stop.
Make the fallback rules global. While here, change the ninjatool recipe to
always have a zero exit status and thus prevent make to emit a warning.
Fixes: a56650518f5b ("configure: integrate Meson in the build system")
Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <159897001659.442705.15538955005543395950.stgit@bahia.lan>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 887adde81d1f1f3897f1688d37ec6851b4fdad86
https://github.com/qemu/qemu/commit/887adde81d1f1f3897f1688d37ec6851b4fdad86
Author: Peter Maydell <peter.maydell@linaro.org>
Date: 2020-09-01 (Tue, 01 Sep 2020)
Changed paths:
M Makefile
M block/meson.build
M chardev/meson.build
M configure
M contrib/vhost-user-gpu/meson.build
M docs/devel/build-system.rst
M docs/meson.build
M meson
M meson.build
M meson_options.txt
M pc-bios/descriptors/meson.build
M pc-bios/keymaps/meson.build
M pc-bios/meson.build
M pc-bios/optionrom/Makefile
M pc-bios/s390-ccw/Makefile
M qga/meson.build
A scripts/meson.build
A scripts/nsis.py
M tools/virtiofsd/meson.build
M trace/meson.build
A ui/icons/meson.build
M ui/meson.build
Log Message:
-----------
Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into
staging
meson fixes:
* bump submodule to 0.55.1
* SDL, pixman and zlib fixes
* firmwarepath fix
* fix firmware builds
meson related:
* move install to Meson
* move NSIS to Meson
* do not make meson use cmake
* add description to options
# gpg: Signature made Tue 01 Sep 2020 17:11:03 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: (26 commits)
Makefile: Fix in-tree clean/distclean
Makefile: Add back TAGS/ctags/cscope rules
meson: add description to options
build: fix recurse-all target
meson: use pkg-config method to find dependencies
configure: do not include ${prefix} in firmwarepath
meson: add pixman dependency to UI modules
meson: add pixman dependency to chardev/baum module
meson: add NSIS building
meson: use meson mandir instead of qemu_mandir
meson: pass docdir option
meson: use meson datadir instead of qemu_datadir
meson: pass qemu_suffix option
configure: build docdir like other suffixed directories
configure: always /-seperate directory from qemu_suffix
configure: rename confsuffix option
meson: move zlib detection to meson
build-sys: remove install target from Makefile
meson: install $localstatedir/run for qga
meson: install desktop file
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Compare: https://github.com/qemu/qemu/compare/8d90bfc5c31a...887adde81d1f
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [qemu/qemu] 465044: meson: bump submodule to 0.55.1,
Peter Maydell <=