diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-09-27 21:10:49 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-09-27 21:10:49 +0100 |
| commit | 3ca7a521e79841f7247feb67780a70722c997d55 (patch) | |
| tree | 30b9afb1b822575d8e6ac4009489795a105a56ce /app-emulation/qemu/files | |
| parent | c268590c556cb766e1ca3f55fde8a40cdde19c44 (diff) | |
gentoo auto-resync : 27:09:2022 - 21:10:48
Diffstat (limited to 'app-emulation/qemu/files')
| -rw-r--r-- | app-emulation/qemu/files/qemu-7.1.0-capstone-include-path.patch | 31 |
1 files changed, 31 insertions, 0 deletions
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 new file mode 100644 index 000000000000..585e798345f4 --- /dev/null +++ b/app-emulation/qemu/files/qemu-7.1.0-capstone-include-path.patch @@ -0,0 +1,31 @@ +Forward ported from qemu-2.11.1-capstone_include_path.patch. +This time also fix the capstone.h header check to use the path we're +already patching in. + +Bug: https://bugs.gentoo.org/873157 +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 20fddbd707..50ce96bbd1 100644 +--- a/meson.build ++++ b/meson.build +@@ -2605,7 +2605,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() |