From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9294B15800F for ; Thu, 5 Jan 2023 05:21:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C676CE07B2; Thu, 5 Jan 2023 05:21:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A188DE07B2 for ; Thu, 5 Jan 2023 05:21:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7BFB9340CD8 for ; Thu, 5 Jan 2023 05:21:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BDBF37F0 for ; Thu, 5 Jan 2023 05:20:59 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1672895680.5eb224df15acf319b38f4cc6874ead2556117cda.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/files/, dev-embedded/openocd/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-embedded/openocd/files/openocd-0.12.0-capstone-includedir.patch dev-embedded/openocd/openocd-0.12.0_rc3.ebuild X-VCS-Directories: dev-embedded/openocd/ dev-embedded/openocd/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5eb224df15acf319b38f4cc6874ead2556117cda X-VCS-Branch: master Date: Thu, 5 Jan 2023 05:20:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 33b03e68-0898-4d7e-9342-9ddc6c6e6fc5 X-Archives-Hash: cc554b22debd8fffe40d43c9a07e5119 commit: 5eb224df15acf319b38f4cc6874ead2556117cda Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Wed Jan 4 23:18:12 2023 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jan 5 05:14:40 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eb224df dev-embedded/openocd: fix capstone include directory Closes: https://bugs.gentoo.org/889762 Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Closes: https://github.com/gentoo/gentoo/pull/28965 Signed-off-by: Sam James gentoo.org> .../files/openocd-0.12.0-capstone-includedir.patch | 40 ++++++++++++++++++++++ dev-embedded/openocd/openocd-0.12.0_rc3.ebuild | 4 +++ 2 files changed, 44 insertions(+) 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 ++#include + + 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 + + #if HAVE_CAPSTONE +-#include ++#include + #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