| 1 |
commit: 9badece6035892cc705ff09dca318c5a59473ae8 |
| 2 |
Author: John Helmert III <ajak <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 27 17:30:25 2022 +0000 |
| 4 |
Commit: John Helmert III <ajak <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 27 17:31:02 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9badece6 |
| 7 |
|
| 8 |
app-emulation/qemu: fix configure failure with USE=capstone |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/873157 |
| 11 |
Signed-off-by: John Helmert III <ajak <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/qemu-7.1.0-capstone-include-path.patch | 31 ++++++++++++++++++++++ |
| 14 |
app-emulation/qemu/qemu-7.1.0.ebuild | 2 +- |
| 15 |
2 files changed, 32 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/app-emulation/qemu/files/qemu-7.1.0-capstone-include-path.patch b/app-emulation/qemu/files/qemu-7.1.0-capstone-include-path.patch |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..585e798345f4 |
| 20 |
--- /dev/null |
| 21 |
+++ b/app-emulation/qemu/files/qemu-7.1.0-capstone-include-path.patch |
| 22 |
@@ -0,0 +1,31 @@ |
| 23 |
+Forward ported from qemu-2.11.1-capstone_include_path.patch. |
| 24 |
+This time also fix the capstone.h header check to use the path we're |
| 25 |
+already patching in. |
| 26 |
+ |
| 27 |
+Bug: https://bugs.gentoo.org/873157 |
| 28 |
+diff --git a/include/disas/capstone.h b/include/disas/capstone.h |
| 29 |
+index e29068dd97..d8fdc5d537 100644 |
| 30 |
+--- a/include/disas/capstone.h |
| 31 |
++++ b/include/disas/capstone.h |
| 32 |
+@@ -3,7 +3,7 @@ |
| 33 |
+ |
| 34 |
+ #ifdef CONFIG_CAPSTONE |
| 35 |
+ |
| 36 |
+-#include <capstone.h> |
| 37 |
++#include <capstone/capstone.h> |
| 38 |
+ |
| 39 |
+ #else |
| 40 |
+ |
| 41 |
+diff --git a/meson.build b/meson.build |
| 42 |
+index 20fddbd707..50ce96bbd1 100644 |
| 43 |
+--- a/meson.build |
| 44 |
++++ b/meson.build |
| 45 |
+@@ -2605,7 +2605,7 @@ if not get_option('capstone').auto() or have_system or have_user |
| 46 |
+ # that reports a wrong -I path, causing the #include to |
| 47 |
+ # fail later. If the system has such a broken version |
| 48 |
+ # do not use it. |
| 49 |
+- if capstone.found() and not cc.compiles('#include <capstone.h>', |
| 50 |
++ if capstone.found() and not cc.compiles('#include <capstone/capstone.h>', |
| 51 |
+ dependencies: [capstone]) |
| 52 |
+ capstone = not_found |
| 53 |
+ if get_option('capstone').enabled() |
| 54 |
|
| 55 |
diff --git a/app-emulation/qemu/qemu-7.1.0.ebuild b/app-emulation/qemu/qemu-7.1.0.ebuild |
| 56 |
index 499aa3a68895..82e527f614ec 100644 |
| 57 |
--- a/app-emulation/qemu/qemu-7.1.0.ebuild |
| 58 |
+++ b/app-emulation/qemu/qemu-7.1.0.ebuild |
| 59 |
@@ -303,11 +303,11 @@ RDEPEND="${CDEPEND} |
| 60 |
)" |
| 61 |
|
| 62 |
PATCHES=( |
| 63 |
- "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch |
| 64 |
"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch |
| 65 |
"${FILESDIR}"/${PN}-6.0.0-make.patch |
| 66 |
"${FILESDIR}"/${PN}-7.1.0-also-build-virtfs-proxy-helper.patch |
| 67 |
"${FILESDIR}"/${PN}-7.1.0-strings.patch |
| 68 |
+ "${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch |
| 69 |
) |
| 70 |
|
| 71 |
QA_PREBUILT=" |
Archives