| Message ID | 20200908184918.1085-3-luoyonggang@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [PULL,01/16] block: Fixes nfs on msys2/mingw | expand |
On 9/8/20 1:49 PM, Yonggang Luo wrote: > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> > --- > capstone | 2 +- > configure | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) The commit message is sparse; it might be nice to give more details about what error is fixed, or possibly even mention of the fact of which capstone commit id that is in 4.0.2 but not the current version matters to qemu on msys. > > 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" This change was not mentioned in the commit message. Did capstone 4.0.2 change where its include files live? Or is it a separate bug, and you are fixing two things at once (in which case, doing two separate commits might be nicer)?
On 9/8/20 8:59 PM, Eric Blake wrote: > On 9/8/20 1:49 PM, Yonggang Luo wrote: >> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> >> --- >> capstone | 2 +- >> configure | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) > > The commit message is sparse; it might be nice to give more details > about what error is fixed, or possibly even mention of the fact of which > capstone commit id that is in 4.0.2 but not the current version matters > to qemu on msys. > >> >> 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" > > This change was not mentioned in the commit message. Did capstone 4.0.2 > change where its include files live? Or is it a separate bug, and you > are fixing two things at once (in which case, doing two separate commits > might be nicer)? As Richard Henderson introduced the capstone submodule, it would be nice to have his Ack-by before updating it. Thanks, Phil.
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)
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> --- capstone | 2 +- configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)