Skip to contentSkip to conversation

configure: Support --enable-capstone=internal

PATCH In review Eduardo Habkost 2 participants 3 messages Sep 5, 2018 – Sep 11, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 configure: Support --enable-capstone=internal

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.

---
 configure | 5 +++++
 1 file changed, 5 insertions(+)
configure +5 -0
index 58862d2ae8..34ed00f6d9 100755
@@ -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:
Signature · 1 line
2.18.0.rc1.1.g3f1ff2140
#1 lore raw
Quoted 2 lines · Eduardo Habkost

Currently there's no way to make configure not try to use the system-provided capstone library using pkgconfig.

Certainly there is.

Quoted 14 lines

Add support to --enable-capstone=internal option to make QEMU not use the system-provided library automatically.

---
 configure | 5 +++++
 1 file changed, 5 insertions(+)
configure +0 -0
index 58862d2ae8..34ed00f6d9 100755

configure for opt do · line 1433

Quoted 3 lines
configure +3 -0
@@ -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~

#2 lore raw
Quoted 9 lines · Richard Henderson
Quoted 2 lines · Eduardo Habkost

Currently there's no way to make configure not try to use the system-provided capstone library using pkgconfig.

Certainly there is.

Quoted 3 lines

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.

Quoted 6 lines
Quoted 6 lines
---
 configure | 5 +++++
 1 file changed, 5 insertions(+)
Quoted 10 lines

configure for opt do · line 1433

Quoted 8 lines
configure +3 -0
index 58862d2ae8..34ed00f6d9 100755
@@ -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.

Signature · 1 line
Eduardo