| Message ID | 20180115023501.37361-1-aik@ozlabs.ru |
|---|---|
| State | New |
| Headers | show |
| Series | [qemu] configure: Allow capstone=git only if git update is not disabled | expand |
On 15.01.2018 03:35, Alexey Kardashevskiy wrote: > Even with --disable-git-update, ./configure tries updating the capstone > submodule instead of marking it "no"; this disables capstone submodule > if git update is disabled. > > Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> > --- > configure | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configure b/configure > index 89bd662..92c21b3 100755 > --- a/configure > +++ b/configure > @@ -4502,7 +4502,7 @@ case "$capstone" in > "" | yes) > if $pkg_config capstone; then > capstone=system > - elif test -e "${source_path}/.git" ; then > + elif test -e "${source_path}/.git" -a $git_update = 'yes' ; then > capstone=git > elif test -e "${source_path}/capstone/Makefile" ; then > capstone=internal > Reviewed-by: Thomas Huth <thuth@redhat.com>
On 15/01/18 17:48, Thomas Huth wrote: > On 15.01.2018 03:35, Alexey Kardashevskiy wrote: >> Even with --disable-git-update, ./configure tries updating the capstone >> submodule instead of marking it "no"; this disables capstone submodule >> if git update is disabled. >> >> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> >> --- >> configure | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/configure b/configure >> index 89bd662..92c21b3 100755 >> --- a/configure >> +++ b/configure >> @@ -4502,7 +4502,7 @@ case "$capstone" in >> "" | yes) >> if $pkg_config capstone; then >> capstone=system >> - elif test -e "${source_path}/.git" ; then >> + elif test -e "${source_path}/.git" -a $git_update = 'yes' ; then >> capstone=git >> elif test -e "${source_path}/capstone/Makefile" ; then >> capstone=internal >> > > Reviewed-by: Thomas Huth <thuth@redhat.com> Thanks mate. What's next? :)
On 29.01.2018 07:44, Alexey Kardashevskiy wrote: > On 15/01/18 17:48, Thomas Huth wrote: >> On 15.01.2018 03:35, Alexey Kardashevskiy wrote: >>> Even with --disable-git-update, ./configure tries updating the capstone >>> submodule instead of marking it "no"; this disables capstone submodule >>> if git update is disabled. >>> >>> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> >>> --- >>> configure | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/configure b/configure >>> index 89bd662..92c21b3 100755 >>> --- a/configure >>> +++ b/configure >>> @@ -4502,7 +4502,7 @@ case "$capstone" in >>> "" | yes) >>> if $pkg_config capstone; then >>> capstone=system >>> - elif test -e "${source_path}/.git" ; then >>> + elif test -e "${source_path}/.git" -a $git_update = 'yes' ; then >>> capstone=git >>> elif test -e "${source_path}/capstone/Makefile" ; then >>> capstone=internal >>> >> >> Reviewed-by: Thomas Huth <thuth@redhat.com> > > Thanks mate. What's next? :) Put Paolo on CC in the hope that he can take it through the misc tree? Or wait for the next trivial PULL request... Thomas
15.01.2018 05:35, Alexey Kardashevskiy wrote: > Even with --disable-git-update, ./configure tries updating the capstone > submodule instead of marking it "no"; this disables capstone submodule > if git update is disabled. Applied to -trivial, thanks! /mjt
diff --git a/configure b/configure index 89bd662..92c21b3 100755 --- a/configure +++ b/configure @@ -4502,7 +4502,7 @@ case "$capstone" in "" | yes) if $pkg_config capstone; then capstone=system - elif test -e "${source_path}/.git" ; then + elif test -e "${source_path}/.git" -a $git_update = 'yes' ; then capstone=git elif test -e "${source_path}/capstone/Makefile" ; then capstone=internal
Even with --disable-git-update, ./configure tries updating the capstone submodule instead of marking it "no"; this disables capstone submodule if git update is disabled. Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)