On Mon, 15 Mar 2021 at 22:04, Peter Maydell <peter.mayd...@linaro.org> wrote:
>
> On Mon, 15 Mar 2021 at 17:47, Paolo Bonzini <pbonz...@redhat.com> wrote:
> >
> > The following changes since commit 51204c2f188ec1e2a38f14718d38a3772f850a4b:
> >
> > Merge remote-tracking branch
> > 'remotes/bkoppelmann2/tags/pull-tricore-20210314' into staging (2021-03-15
> > 15:34:27 +0000)
> >
> > are available in the Git repository at:
> >
> > https://gitlab.com/bonzini/qemu.git tags/for-upstream-meson-0.57
> >
> > for you to fetch changes up to 57d42c3b774d0716b9ad1a5a576480521edc7201:
> >
> > hexagon: use env keyword argument to pass PYTHONPATH (2021-03-15 18:06:21
> > +0100)
> >
> > v1->v2: rebased
> >
> > ----------------------------------------------------------------
> > Update Meson to 0.57.
> >
> > ----------------------------------------------------------------
> > Paolo Bonzini (5):
> > hexagon: do not specify executables as inputs
> > hexagon: do not specify Python scripts as inputs
> > meson: bump submodule to 0.57.1
> > meson: switch minimum meson version to 0.57.0
> > hexagon: use env keyword argument to pass PYTHONPATH
>
> Fails to build, on at least x86-64, s390, ppc, aarch32, aarch64
> Linux hosts:
This pullreq also caused a build failure on OSX when trying to build
something else after rolling back the merge (but only on OSX, oddly):
make: Entering directory '/Users/pm215/src/qemu-for-merges/build/all'
config-host.mak is out-of-date, running configure
GIT ui/keycodemapdb tests/fp/berkeley-testfloat-3
tests/fp/berkeley-softfloat-3 meson dtc capstone slirp
Disabling PIE due to missing toolchain support
/usr/local/bin/ninja build.ninja && touch build.ninja.stamp
[0/1] Regenerating build files.
Traceback (most recent call last):
File "/Users/pm215/src/qemu-for-merges/meson/mesonbuild/mesonmain.py",
line 140, in run
return options.run_func(options)
File "/Users/pm215/src/qemu-for-merges/meson/mesonbuild/msetup.py",
line 245, in run
app.generate()
File "/Users/pm215/src/qemu-for-merges/meson/mesonbuild/msetup.py",
line 154, in generate
env = environment.Environment(self.source_dir, self.build_dir, self.options)
File "/Users/pm215/src/qemu-for-merges/meson/mesonbuild/environment.py",
line 523, in __init__
self.coredata = coredata.load(self.get_build_dir())
File "/Users/pm215/src/qemu-for-merges/meson/mesonbuild/coredata.py",
line 1016, in load
obj = pickle.load(f)
ModuleNotFoundError: No module named 'mesonbuild.mesonlib.universal';
'mesonbuild.mesonlib' is not a package
FAILED: build.ninja
/usr/local/opt/python@3.8/bin/python3.8
/Users/pm215/src/qemu-for-merges/meson/meson.py --internal regenerate
/Users/pm215/src/qemu-for-merges
/Users/pm215/src/qemu-for-merges/build/all --backend ninja
ninja: error: rebuilding 'build.ninja': subcommand failed
This kind of "breaks the build tree such that you can't
just 'git reset' back to master" bug is irritating. Doesn't
meson have an "is this the right version" check on the cached
data it's loading out of the build tree ?
thanks
-- PMM
