Re: [PATCH v8 03/27] ci: fixes msys2 build by upgrading capstone to 4.0.2

2020-09-14 Thread Yonggang Luo 
On Mon, Sep 14, 2020 at 3:10 PM Thomas Huth  wrote:
>
> On 13/09/2020 00.44, 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 , and the exist include path should
preserve, because
> > in capstone code there something like #include "capstone/capstone.h"
> >
> > If only using
> > capstone_cflags="-I${source_path}/capstone/include/capstone"
> > Then will cause the following compiling error:
> >
> >   CC  cs.o
> > cs.c:17:10: fatal error: 'capstone/capstone.h' file not found
> > #include 
> >  ^
> > 1 error generated.
> >
> > Signed-off-by: Yonggang Luo 
> > ---
> >  capstone  | 2 +-
> >  configure | 2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/capstone b/capstone
> > index 22ead3e0bf..1d23053284 16
> > --- a/capstone
> > +++ b/capstone
> > @@ -1 +1 @@
> > -Subproject commit 22ead3e0bfdb87516656453336160e0a37b066bf
> > +Subproject commit 1d230532840a37ac032c6ab80128238fc930c6c1
>
> Richard has a patch series on the list now to update and improve the
> capstone submodule (see "capstone + disassembler patches") ... I think
> this patch here will then not be required anymore.
I've seen that, of cause, this patch need to be dropped.
>
>  Thomas
>


--
 此致
礼
罗勇刚
Yours
sincerely,
Yonggang Luo

Re: [PATCH v8 03/27] ci: fixes msys2 build by upgrading capstone to 4.0.2

2020-09-14 Thread Thomas Huth 
On 13/09/2020 00.44, 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 , and the exist include path should 
> preserve, because
> in capstone code there something like #include "capstone/capstone.h"
> 
> If only using
> capstone_cflags="-I${source_path}/capstone/include/capstone"
> Then will cause the following compiling error:
> 
>   CC  cs.o
> cs.c:17:10: fatal error: 'capstone/capstone.h' file not found
> #include 
>  ^
> 1 error generated.
> 
> Signed-off-by: Yonggang Luo 
> ---
>  capstone  | 2 +-
>  configure | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/capstone b/capstone
> index 22ead3e0bf..1d23053284 16
> --- a/capstone
> +++ b/capstone
> @@ -1 +1 @@
> -Subproject commit 22ead3e0bfdb87516656453336160e0a37b066bf
> +Subproject commit 1d230532840a37ac032c6ab80128238fc930c6c1

Richard has a patch series on the list now to update and improve the
capstone submodule (see "capstone + disassembler patches") ... I think
this patch here will then not be required anymore.

 Thomas

[PATCH v8 03/27] ci: fixes msys2 build by upgrading capstone to 4.0.2

2020-09-12 Thread Yonggang Luo 
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 , and the exist include path should preserve, 
because
in capstone code there something like #include "capstone/capstone.h"

If only using
capstone_cflags="-I${source_path}/capstone/include/capstone"
Then will cause the following compiling error:

  CC  cs.o
cs.c:17:10: fatal error: 'capstone/capstone.h' file not found
#include 
 ^
1 error generated.

Signed-off-by: Yonggang Luo 
---
 capstone  | 2 +-
 configure | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/capstone b/capstone
index 22ead3e0bf..1d23053284 16
--- 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)
-- 
2.28.0.windows.1