| Message ID | 20200909094617.1582-3-luoyonggang@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | W32, W64 msys2/mingw patches | expand |
On Wed, Sep 9, 2020 at 8:27 PM Daniel P. Berrangé <berrange@redhat.com> wrote: > On Wed, Sep 09, 2020 at 05:45:58PM +0800, Yonggang Luo wrote: > > The currently random version capstone have the following compiling issue: > > CC /c/work/xemu/qemu/build/slirp/src/arp_table.o > > make[1]: *** No rule to make target > “/c/work/xemu/qemu/build/capstone/capstone.lib”。 Stop. > > > > Subproject commit 1d230532840a37ac032c6ab80128238fc930c6c1 are the > tagged version 4.0.2 > > when upgrading to this version, the folder structure of include are > changed to > > qemu\capstone\include > > │ platform.h > > │ > > ├─capstone > > │ arm.h > > │ arm64.h > > │ capstone.h > > │ evm.h > > │ m680x.h > > │ m68k.h > > │ mips.h > > │ platform.h > > │ ppc.h > > │ sparc.h > > │ systemz.h > > │ tms320c64x.h > > │ x86.h > > │ xcore.h > > │ > > └─windowsce > > intrin.h > > stdint.h > > > > in capstone. so we need add extra include path > -I${source_path}/capstone/include/capstone > > for directly #include <capstone.h>, and the exist include path should > preserve, because > > in capstone code there something like #include "capstone/capstone.h" > > > > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> > > --- > > capstone | 2 +- > > configure | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/capstone b/capstone > > index 22ead3e0bf..1d23053284 160000 > > --- a/capstone > > +++ b/capstone > > @@ -1 +1 @@ > > -Subproject commit 22ead3e0bfdb87516656453336160e0a37b066bf > > +Subproject commit 1d230532840a37ac032c6ab80128238fc930c6c1 > > diff --git a/configure b/configure > > index 4231d56bcc..f4f8bc3756 100755 > > --- a/configure > > +++ b/configure > > @@ -5156,7 +5156,7 @@ case "$capstone" in > > LIBCAPSTONE=libcapstone.a > > fi > > capstone_libs="-Lcapstone -lcapstone" > > - capstone_cflags="-I${source_path}/capstone/include" > > + capstone_cflags="-I${source_path}/capstone/include > -I${source_path}/capstone/include/capstone" > > IIUC, the original -I arg can be removed - we just need the new one. > That's not correct, doing that will cause compiling failure Please take a look at https://cirrus-ci.com/task/6709042959613952?command=main#L384 > > > Regards, > Daniel > -- > |: https://berrange.com -o- > https://www.flickr.com/photos/dberrange :| > |: https://libvirt.org -o- > https://fstop138.berrange.com :| > |: https://entangle-photo.org -o- > https://www.instagram.com/dberrange :| > >
diff --git a/capstone b/capstone index 22ead3e0bf..1d23053284 160000 --- a/capstone +++ b/capstone @@ -1 +1 @@ -Subproject commit 22ead3e0bfdb87516656453336160e0a37b066bf +Subproject commit 1d230532840a37ac032c6ab80128238fc930c6c1 diff --git a/configure b/configure index 4231d56bcc..f4f8bc3756 100755 --- a/configure +++ b/configure @@ -5156,7 +5156,7 @@ case "$capstone" in LIBCAPSTONE=libcapstone.a fi capstone_libs="-Lcapstone -lcapstone" - capstone_cflags="-I${source_path}/capstone/include" + capstone_cflags="-I${source_path}/capstone/include -I${source_path}/capstone/include/capstone" ;; system)
The currently random version capstone have the following compiling issue: CC /c/work/xemu/qemu/build/slirp/src/arp_table.o make[1]: *** No rule to make target “/c/work/xemu/qemu/build/capstone/capstone.lib”。 Stop. Subproject commit 1d230532840a37ac032c6ab80128238fc930c6c1 are the tagged version 4.0.2 when upgrading to this version, the folder structure of include are changed to qemu\capstone\include │ platform.h │ ├─capstone │ arm.h │ arm64.h │ capstone.h │ evm.h │ m680x.h │ m68k.h │ mips.h │ platform.h │ ppc.h │ sparc.h │ systemz.h │ tms320c64x.h │ x86.h │ xcore.h │ └─windowsce intrin.h stdint.h in capstone. so we need add extra include path -I${source_path}/capstone/include/capstone for directly #include <capstone.h>, and the exist include path should preserve, because in capstone code there something like #include "capstone/capstone.h" Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> --- capstone | 2 +- configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)