On Sat, 18 Sept 2021 at 10:34, Paolo Bonzini <pbonz...@redhat.com> wrote:
>
> The following changes since commit 831aaf24967a49d7750090b9dcfd6bf356f16529:
>
> Merge remote-tracking branch 'remotes/marcandre/tags/misc-pull-request'
> into staging (2021-09-14 18:14:56 +0100)
>
> are available in the Git repository at:
>
> https://gitlab.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to ccc3f971c37bd2202a21abc9f0be093f10426364:
>
> hexagon: use env keyword argument to pass PYTHONPATH (2021-09-15 09:12:55
> +0200)
>
> ----------------------------------------------------------------
> * Update Meson to 0.58.2
>
> ----------------------------------------------------------------
> Paolo Bonzini (3):
> meson: bump submodule to 0.58.2
> meson: switch minimum meson version to 0.58.2
> hexagon: use env keyword argument to pass PYTHONPATH
So, I tried merging this, ran into some "is this an issue with this
pullreq or is it just an intermittent or infrastructure" issues,
and decided to postpone the merge for a bit and retry it later.
It has made an absolute mess of my incremental build setups.
They now all fail with errors like this, even after having blown
away the build directory and re-created it:
Darwin manooth.archaic.org.uk 19.6.0 x86_64
make: Entering directory '/Users/pm215/src/qemu-for-merges/build/all'
/usr/local/bin/ninja build.ninja && touch build.ninja.stamp
GIT ui/keycodemapdb meson tests/fp/berkeley-testfloat-3
tests/fp/berkeley-softfloat-3 dtc capstone slirp
[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
Is there anything that can be done to make meson version bumps
not a horrific pain to back out ? This seems to go wrong pretty
much every time.
thanks
-- PMM
