[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v8 03/27] ci: fixes msys2 build by upgrading capstone to 4.0.2
From: |
Yonggang Luo |
Subject: |
[PATCH v8 03/27] ci: fixes msys2 build by upgrading capstone to 4.0.2 |
Date: |
Sun, 13 Sep 2020 06:44:07 +0800 |
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"
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 <capstone/capstone.h>
^~~~~~~~~~~~~~~~~~~~~
1 error generated.
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"
;;
system)
--
2.28.0.windows.1
[PATCH v8 03/27] ci: fixes msys2 build by upgrading capstone to 4.0.2,
Yonggang Luo <=
[PATCH v8 04/27] configure: Fixes ncursesw detection under msys2/mingw and enable curses, Yonggang Luo, 2020/09/12
[PATCH v8 05/27] win32: Simplify gmtime_r detection direct base on _POSIX_THREAD_SAFE_FUNCTIONS., Yonggang Luo, 2020/09/12
[PATCH v8 06/27] curses: Fixes curses compiling errors., Yonggang Luo, 2020/09/12
[PATCH v8 07/27] tests: disable /char/stdio/* tests in test-char.c on win32, Yonggang Luo, 2020/09/12
[PATCH v8 08/27] tests: Fixes test-replication.c on msys2/mingw., Yonggang Luo, 2020/09/12
[PATCH v8 11/27] meson: Use -b to ignore CR vs. CR-LF issues on Windows, Yonggang Luo, 2020/09/12