Re: [PULL 0/3] capstone update

[Peter Maydell]

On Mon, 13 Jan 2020 at 19:53, Richard Henderson
<address@hidden> wrote:
>
> On 1/10/20 6:07 AM, Peter Maydell wrote:
> > On Wed, 8 Jan 2020 at 04:23, Richard Henderson
> > <address@hidden> wrote:
> >>
> >> The following changes since commit 
> >> 035eed4c0d257c905a556fa0f4865a0c077b4e7f:
> >>
> >>   Merge remote-tracking branch 
> >> 'remotes/vivier/tags/q800-for-5.0-pull-request' into staging (2020-01-07 
> >> 17:08:21 +0000)
> >>
> >> are available in the Git repository at:
> >>
> >>   https://github.com/rth7680/qemu.git tags/pull-cap-20200108
> >>
> >> for you to fetch changes up to 7cc3836eac04a3e358b2496fbca704b3ee5197ae:
> >>
> >>   capstone: Add skipdata hook for s390x (2020-01-08 14:53:54 +1100)
> >>
> >> ----------------------------------------------------------------
> >> Update capstone to next
> >>
> >> ----------------------------------------------------------------
> >> Richard Henderson (3):
> >>       capstone: Update to next
> >>       capstone: Enable disassembly for s390x
> >>       capstone: Add skipdata hook for s390x
> >
> > Build failures:
> >
> >   CC      aarch64-linux-user/disas.o
> > In file included from
> > /home/ubuntu/qemu/capstone/include/capstone/capstone.h:302:0,
> >                  from /home/ubuntu/qemu/include/disas/capstone.h:6,
> >                  from /home/ubuntu/qemu/disas.c:9:
> > /home/ubuntu/qemu/capstone/include/capstone/riscv.h:16:10: fatal
> > error: capstone/platform.h: No such file or directory
> >  #include "capstone/platform.h"
> >           ^~~~~~~~~~~~~~~~~~~~~
> > compilation terminated.
> >
> > (same on most hosts)
>
> This comes from not re-running configure, which changes the CFLAGS for the
> build of capstone from git.  Given that the source tree for capstone got
> rearranged between 3.x and 4.0, I don't see how I can avoid this.

Hmm, shouldn't the update to 'configure' in this merge cause Make
to rerun configure, though ?

thanks
-- PMM