app-emulation/qemu/files/qemu-9.0.0-capstone-include-path.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42

From 67a8b35e98f5c0853f7cdf26db0ebc6ce20b929c Mon Sep 17 00:00:00 2001
Message-ID: <67a8b35e98f5c0853f7cdf26db0ebc6ce20b929c.1714317553.git.mprivozn@redhat.com>
From: Michal Privoznik <mprivozn@redhat.com>
Date: Sun, 28 Apr 2024 17:10:46 +0200
Subject: [PATCH] Forward ported from qemu-7.1.0-capstone-include-path.patch.

Bug: https://bugs.gentoo.org/873157
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 include/disas/capstone.h | 2 +-
 meson.build              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/disas/capstone.h b/include/disas/capstone.h
index e29068dd97..d8fdc5d537 100644
--- a/include/disas/capstone.h
+++ b/include/disas/capstone.h
@@ -3,7 +3,7 @@
 
 #ifdef CONFIG_CAPSTONE
 
-#include <capstone.h>
+#include <capstone/capstone.h>
 
 #else
 
diff --git a/meson.build b/meson.build
index ea3ccff968..c3a2be7b2d 100644
--- a/meson.build
+++ b/meson.build
@@ -1712,7 +1712,7 @@ if not get_option('capstone').auto() or have_system or have_user
   # that reports a wrong -I path, causing the #include to
   # fail later. If the system has such a broken version
   # do not use it.
-  if capstone.found() and not cc.compiles('#include <capstone.h>',
+  if capstone.found() and not cc.compiles('#include <capstone/capstone.h>',
                                           dependencies: [capstone])
     capstone = not_found
     if get_option('capstone').enabled()
-- 
2.43.2