diff options
| author |   Mario Haustein <mario.haustein@hrz.tu-chemnitz.de> | 2023-01-05 00:18:12 +0100 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2023-01-05 05:14:40 +0000 |
| commit | 5eb224df15acf319b38f4cc6874ead2556117cda (patch) | |
| tree | 58e0e87576ab023cbb6c8c384d0b8dbf03c3dd00 /dev-embedded | |
| parent | dev-java/unbescape: new package, add 1.1.6 (diff) | |
| download | gentoo-5eb224df15acf319b38f4cc6874ead2556117cda.tar.gz gentoo-5eb224df15acf319b38f4cc6874ead2556117cda.tar.bz2 gentoo-5eb224df15acf319b38f4cc6874ead2556117cda.zip | |
dev-embedded/openocd: fix capstone include directory
Closes: https://bugs.gentoo.org/889762
Signed-off-by: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/28965
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-embedded')
| -rw-r--r-- | dev-embedded/openocd/files/openocd-0.12.0-capstone-includedir.patch | 40 | ||||
| -rw-r--r-- | dev-embedded/openocd/openocd-0.12.0_rc3.ebuild | 4 |
2 files changed, 44 insertions, 0 deletions
diff --git a/dev-embedded/openocd/files/openocd-0.12.0-capstone-includedir.patch b/dev-embedded/openocd/files/openocd-0.12.0-capstone-includedir.patch new file mode 100644 index 000000000000..f2dbff6520e5 --- /dev/null +++ b/dev-embedded/openocd/files/openocd-0.12.0-capstone-includedir.patch @@ -0,0 +1,40 @@ +Bug: https://bugs.gentoo.org/889762 +diff --git a/contrib/cross-build.sh b/contrib/cross-build.sh +index b199bf715..919a22005 100755 +--- a/contrib/cross-build.sh ++++ b/contrib/cross-build.sh +@@ -155,7 +155,7 @@ if [ -d $CAPSTONE_SRC ] ; then + sed -i '1s;^;prefix=/usr \ + exec_prefix=${prefix} \ + libdir=${exec_prefix}/lib \ +-includedir=${prefix}/include/capstone\n\n;' $CAPSTONE_PC_FILE ++includedir=${prefix}/include\n\n;' $CAPSTONE_PC_FILE + fi + + +diff --git a/src/target/a64_disassembler.c b/src/target/a64_disassembler.c +index ca3d3ea7a..9579860f0 100644 +--- a/src/target/a64_disassembler.c ++++ b/src/target/a64_disassembler.c +@@ -15,7 +15,7 @@ + + #if HAVE_CAPSTONE + +-#include <capstone.h> ++#include <capstone/capstone.h> + + static void print_opcode(struct command_invocation *cmd, const cs_insn *insn) + { +diff --git a/src/target/arm_disassembler.c b/src/target/arm_disassembler.c +index 749274f36..e78d08853 100644 +--- a/src/target/arm_disassembler.c ++++ b/src/target/arm_disassembler.c +@@ -16,7 +16,7 @@ + #include <helper/log.h> + + #if HAVE_CAPSTONE +-#include <capstone.h> ++#include <capstone/capstone.h> + #endif + + /* diff --git a/dev-embedded/openocd/openocd-0.12.0_rc3.ebuild b/dev-embedded/openocd/openocd-0.12.0_rc3.ebuild index 57562d0c8fc5..031ef6803e37 100644 --- a/dev-embedded/openocd/openocd-0.12.0_rc3.ebuild +++ b/dev-embedded/openocd/openocd-0.12.0_rc3.ebuild @@ -36,6 +36,10 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}/${PN}-0.12.0-capstone-includedir.patch" +) + src_prepare() { default |