Re: [PULL 00/26] Misc patches for 2021-05-20

[Peter Maydell]

On Thu, 20 May 2021 at 15:20, Peter Maydell <peter.maydell@linaro.org> wrote:
>
> On Thu, 20 May 2021 at 14:26, Peter Maydell <peter.maydell@linaro.org> wrote:
> >
> > On Thu, 20 May 2021 at 09:31, Paolo Bonzini <pbonzini@redhat.com> wrote:

> > > ----------------------------------------------------------------
> > > * submodule cleanups (Philippe, myself)
> > > * tiny step towards a usable preconfig mode (myself)
> > > * bump Meson submodule (myself)
> > > * Kconfig and LOCK_GUARD cleanups (philippe)
> > > * new x86 CPUID feature (Yang Zhong)
> > > * "-object qtest" support (myself)
> > > * Dirty ring support for KVM (Peter)
> > > * Fixes for 6.0 command line parsing breakage (myself)
> > > * Fix for macOS 11.3 SDK (Katsuhiro)
> > > * Fix for scsi-generic handling (myself)
> > >
> >
> >
> > Fails to build on PPC64:
> >
> > WARNING: Project specifies a minimum meson_version '>=0.55.0' but uses
> > features which were added in newer versions:
> >  * 0.57.0: {'test() timeout <= 0'}
> >
> >
> > ERROR: Could not detect Ninja v1.8.2 or newer
>
> Also, my OSX build which I configure with
> ../..configure --extra-cflags='-fdiagnostics-color=never -Werror
> -Wno-error=deprecated-declarations'
>
> now triggers a meson.build warning:

Also also, dropping the merge commit reveals that the pullreq somehow
broke the build trees such that trying to do a build on master no
longer works:

make: Entering directory '/home/pm/qemu/build/all'
config-host.mak is out-of-date, running configure
  GIT     ui/keycodemapdb meson tests/fp/berkeley-testfloat-3
tests/fp/berkeley-softfloat-3 dtc capstone slirp
/usr/bin/ninja  build.ninja && touch build.ninja.stamp
[0/1] Regenerating build files.
Traceback (most recent call last):
  File "/home/pm/qemu/meson/mesonbuild/mesonmain.py", line 140, in run
    return options.run_func(options)
  File "/home/pm/qemu/meson/mesonbuild/msetup.py", line 245, in run
    app.generate()
  File "/home/pm/qemu/meson/mesonbuild/msetup.py", line 154, in generate
    env = environment.Environment(self.source_dir, self.build_dir, self.options)
  File "/home/pm/qemu/meson/mesonbuild/environment.py", line 523, in __init__
    self.coredata = coredata.load(self.get_build_dir())
  File "/home/pm/qemu/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


This seems like a meson bug -- if the cached data isn't valid for
this version of meson it should just blow it away, not die with
a backtrace.

thanks
-- PMM