[v5] Green the msys2 CI make

[PATCH v5 03/11] ci: fixes msys2 build by upgrading capstone to 4.0.2

Posted by Yonggang Luo 5 years, 5 months ago

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 5d8bf4d8bb..f8cbd2898c 100755
--- a/configure
+++ b/configure
@@ -5117,7 +5117,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

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

Posted by Mark Cave-Ayland 5 years, 5 months ago

On 05/09/2020 07:23, Yonggang Luo wrote:

> 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 5d8bf4d8bb..f8cbd2898c 100755
> --- a/configure
> +++ b/configure
> @@ -5117,7 +5117,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)

Just to reiterate from the other meson thread: the reason that the current capstone
won't compile under Windows is due to https://bugs.launchpad.net/qemu/+bug/1826175.

The merged fix from
https://github.com/aquynh/capstone/commit/29893c63e34ee21846744d02c396ae3c801b936b is
really quite simple - it might be that if upgrading is not an option then a suitable
WIN32 configure hack could be used.

ATB,

Mark.

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

Posted by 罗勇刚 (Yonggang Luo) 5 years, 5 months ago

On Sat, Sep 5, 2020 at 7:14 PM Mark Cave-Ayland <
mark.cave-ayland@ilande.co.uk> wrote:

> On 05/09/2020 07:23, Yonggang Luo wrote:
>
> > 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 5d8bf4d8bb..f8cbd2898c 100755
> > --- a/configure
> > +++ b/configure
> > @@ -5117,7 +5117,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)
>
> Just to reiterate from the other meson thread: the reason that the current
> capstone
> won't compile under Windows is due to
> https://bugs.launchpad.net/qemu/+bug/1826175.
>
> The merged fix from
>
> https://github.com/aquynh/capstone/commit/29893c63e34ee21846744d02c396ae3c801b936b
> is
> really quite simple - it might be that if upgrading is not an option then
> a suitable
> WIN32 configure hack could be used.
>
Who is responsible for capstone? Capstone is not a key component, just for
disassembly, the newest version would have more function i guess.

>
>
> ATB,
>
> Mark.
>


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

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

Posted by Peter Maydell 5 years, 5 months ago

On Sat, 5 Sep 2020 at 14:23, 罗勇刚(Yonggang Luo) <luoyonggang@gmail.com> wrote:
> Who is responsible for capstone?

Richard Henderson generally looks after it. (We don't have an
entry for it in MAINTAINERS, which is an oversight.)

-- PMM