On 7 June 2016 at 12:03, Paolo Bonzini <[email protected]> wrote: > On 07/06/2016 12:58, Peter Maydell wrote: >> Worse, when I revert this merge attempt and do a build on the previously >> working master, it fails (all trees, all configs): >> >> /home/pm215/qemu/qemu-img.c: In function ‘help’: >> /home/pm215/qemu/qemu-img.c:43:59: error: expected ‘,’ or ‘;’ before >> ‘QEMU_PKGVERSION’ >> #define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION QEMU_PKGVERSION \ >> ^ >> /home/pm215/qemu/qemu-img.c:89:12: note: in expansion of macro >> ‘QEMU_IMG_VERSION’ >> QEMU_IMG_VERSION >> ^ >> /home/pm215/qemu/qemu-img.c: In function ‘main’: >> /home/pm215/qemu/qemu-img.c:43:59: error: expected ‘)’ before >> ‘QEMU_PKGVERSION’ >> #define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION QEMU_PKGVERSION \ >> ^ >> /home/pm215/qemu/qemu-img.c:3520:16: note: in expansion of macro >> ‘QEMU_IMG_VERSION’ >> printf(QEMU_IMG_VERSION); >> ^ >> >> The change is badly broken somehow. > > This is the same issue with PKGVERSION being defined twice (before) and > nowhere (now), instead of once. And I suspect this is a long-standing > issue where config-host.mak and config-host.h are not being rebuilt > correctly. > > However, if you force-rebuild config-host.h it should work.
It didn't. I've just spent a bunch of time manually going around and forcing reconfigures in all my build trees to unwedge them again :-( thanks -- PMM
