| Message ID | 20200914000153.1725632-3-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | capstone + disassembler patches | expand |
On 9/14/20 2:01 AM, Richard Henderson wrote: > This branch contains a number of improvements over master, > including making all of the disassembler data constant. > > We are skipping past the 4.0 branchpoint, which changed > the location of the includes within the source directory. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > capstone | 2 +- > meson.build | 3 ++- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/capstone b/capstone > index 22ead3e0bf..f8b1b83301 160000 > --- a/capstone > +++ b/capstone > @@ -1 +1 @@ > -Subproject commit 22ead3e0bfdb87516656453336160e0a37b066bf > +Subproject commit f8b1b833015a4ae47110ed068e0deb7106ced66d > diff --git a/meson.build b/meson.build > index 4417de1e14..00e2b8cc29 100644 > --- a/meson.build > +++ b/meson.build > @@ -668,6 +668,7 @@ else > 'capstone/arch/X86/X86DisassemblerDecoder.c', > 'capstone/arch/X86/X86ATTInstPrinter.c', > 'capstone/arch/X86/X86IntelInstPrinter.c', > + 'capstone/arch/X86/X86InstPrinterCommon.c', > 'capstone/arch/X86/X86Mapping.c', > 'capstone/arch/X86/X86Module.c' > ) > @@ -692,7 +693,7 @@ else > c_args: capstone_cargs, > include_directories: 'capstone/include') > capstone = declare_dependency(link_with: libcapstone, > - include_directories: 'capstone/include') > + include_directories: 'capstone/include/capstone') > endif Not sure what is missing (here or in the previous?), I'm getting: In file included from disas/capstone.c:9: include/disas/capstone.h:6:10: fatal error: capstone.h: No such file or directory 6 | #include <capstone.h> | ^~~~~~~~~~~~ Ah, my build directory was already configured, so it uses --skip-meson. Re-configuring without that, the build succeeds. Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Paolo, maybe git submodule updates should invalidate the '--skip-meson' option? Regards, Phil.
diff --git a/capstone b/capstone index 22ead3e0bf..f8b1b83301 160000 --- a/capstone +++ b/capstone @@ -1 +1 @@ -Subproject commit 22ead3e0bfdb87516656453336160e0a37b066bf +Subproject commit f8b1b833015a4ae47110ed068e0deb7106ced66d diff --git a/meson.build b/meson.build index 4417de1e14..00e2b8cc29 100644 --- a/meson.build +++ b/meson.build @@ -668,6 +668,7 @@ else 'capstone/arch/X86/X86DisassemblerDecoder.c', 'capstone/arch/X86/X86ATTInstPrinter.c', 'capstone/arch/X86/X86IntelInstPrinter.c', + 'capstone/arch/X86/X86InstPrinterCommon.c', 'capstone/arch/X86/X86Mapping.c', 'capstone/arch/X86/X86Module.c' ) @@ -692,7 +693,7 @@ else c_args: capstone_cargs, include_directories: 'capstone/include') capstone = declare_dependency(link_with: libcapstone, - include_directories: 'capstone/include') + include_directories: 'capstone/include/capstone') endif # Generators
This branch contains a number of improvements over master, including making all of the disassembler data constant. We are skipping past the 4.0 branchpoint, which changed the location of the includes within the source directory. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- capstone | 2 +- meson.build | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) -- 2.25.1