qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Yonggang Luo <luoyonggang@gmail.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
	Yonggang Luo <luoyonggang@gmail.com>
Subject: [PATCH v2 8/9] ci: fixes msys2 build by upgrading capstone to 4.0.2
Date: Thu,  3 Sep 2020 05:42:10 +0800	[thread overview]
Message-ID: <20200902214211.337-9-luoyonggang@gmail.com> (raw)
In-Reply-To: <20200902214211.337-1-luoyonggang@gmail.com>

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
 capstone  | 2 +-
 configure | 4 ++--
 2 files changed, 3 insertions(+), 3 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 5f2bcc4b57..e42d210e5f 100755
--- a/configure
+++ b/configure
@@ -5248,14 +5248,14 @@ case "$capstone" in
       git_submodules="${git_submodules} capstone"
     fi
     mkdir -p capstone
-    QEMU_CFLAGS="$QEMU_CFLAGS -I${source_path}/capstone/include"
+    QEMU_CFLAGS="$QEMU_CFLAGS -I${source_path}/capstone/include -I${source_path}/capstone/include/capstone"
     if test "$mingw32" = "yes"; then
       LIBCAPSTONE=capstone.lib
     else
       LIBCAPSTONE=libcapstone.a
     fi
     capstone_libs="-L${build_path}/capstone -lcapstone"
-    capstone_cflags="-I${source_path}/capstone/include"
+    capstone_cflags="-I${source_path}/capstone/include -I${source_path}/capstone/include/capstone"
     ;;
 
   system)
-- 
2.27.0.windows.1



  parent reply	other threads:[~2020-09-02 21:47 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-02 21:42 [PATCH v2 0/9] Green the msys2 CI make Yonggang Luo
2020-09-02 21:42 ` [PATCH v2 1/9] configure: fixes dtc not cloned when running msys2 CI Yonggang Luo
2020-09-02 21:42 ` [PATCH v2 2/9] meson: Convert undefsym.sh to undefsym.py Yonggang Luo
2020-09-02 21:42 ` [PATCH v2 3/9] tcg: Fixes dup_const link error Yonggang Luo
2020-09-02 21:42 ` [PATCH v2 4/9] tests: handling signal on win32 properly Yonggang Luo
2020-09-02 21:42 ` [PATCH v2 5/9] configure: Fix include and linkage issue on msys2 Yonggang Luo
2020-09-02 21:42 ` [PATCH v2 6/9] block: Fixes nfs on msys2/mingw Yonggang Luo
2020-09-02 21:42 ` [PATCH v2 7/9] osdep: These function are only available on Non-Win32 system Yonggang Luo
2020-09-02 21:42 ` Yonggang Luo [this message]
2020-09-02 21:42 ` [PATCH v2 9/9] ci: Enable msys2 ci in cirrus Yonggang Luo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200902214211.337-9-luoyonggang@gmail.com \
    --to=luoyonggang@gmail.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).