| Message ID | 20180905151927.8884-1-ehabkost@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | configure: Support --enable-capstone=internal | expand |
On 09/05/2018 08:19 AM, Eduardo Habkost wrote: > Currently there's no way to make configure not try to use the > system-provided capstone library using pkgconfig. Certainly there is. > > Add support to --enable-capstone=internal option to make QEMU not > use the system-provided library automatically. > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> > --- > configure | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/configure b/configure > index 58862d2ae8..34ed00f6d9 100755 > --- a/configure > +++ b/configure > @@ -1431,6 +1431,8 @@ for opt do > + --enable-capstone[=LOCATION] > + Where to look for capstone library. > + Supported options: internal, git, system That's what "git" means here. r~
On Tue, Sep 11, 2018 at 07:33:08AM -0700, Richard Henderson wrote: > On 09/05/2018 08:19 AM, Eduardo Habkost wrote: > > Currently there's no way to make configure not try to use the > > system-provided capstone library using pkgconfig. > > Certainly there is. > > > > > Add support to --enable-capstone=internal option to make QEMU not > > use the system-provided library automatically. Oops, the commit message is inaccurate: we can prevent ./configure from trying the system library, but there's no way to make it avoid using git submodule at the same time. > > > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> > > --- > > configure | 5 +++++ > > 1 file changed, 5 insertions(+) > > > > diff --git a/configure b/configure > > index 58862d2ae8..34ed00f6d9 100755 > > --- a/configure > > +++ b/configure > > @@ -1431,6 +1431,8 @@ for opt do > > + --enable-capstone[=LOCATION] > > + Where to look for capstone library. > > + Supported options: internal, git, system > > That's what "git" means here. "git" makes ./configure add capstone to GIT_SUBMODULES, and I'm pretty sure we don't want that if we're not building from a git tree.
diff --git a/configure b/configure index 58862d2ae8..34ed00f6d9 100755 --- a/configure +++ b/configure @@ -1431,6 +1431,8 @@ for opt do ;; --enable-capstone=system) capstone="system" ;; + --enable-capstone=internal) capstone="internal" + ;; --with-git=*) git="$optarg" ;; --enable-git-update) git_update=yes @@ -1635,6 +1637,9 @@ Advanced options (experts only): xen pv domain builder --enable-debug-stack-usage track the maximum stack usage of stacks created by qemu_alloc_stack + --enable-capstone[=LOCATION] + Where to look for capstone library. + Supported options: internal, git, system Optional features, enabled with --enable-FEATURE and disabled with --disable-FEATURE, default is enabled if available:
Currently there's no way to make configure not try to use the system-provided capstone library using pkgconfig. Add support to --enable-capstone=internal option to make QEMU not use the system-provided library automatically. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- configure | 5 +++++ 1 file changed, 5 insertions(+)