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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E0A93158094 for ; Tue, 27 Sep 2022 17:31:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E034CE0AAC; Tue, 27 Sep 2022 17:31:09 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 C6F0EE0AAC for ; Tue, 27 Sep 2022 17:31:09 +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 B62DB341011 for ; Tue, 27 Sep 2022 17:31:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 09BAA5C7 for ; Tue, 27 Sep 2022 17:31:07 +0000 (UTC) From: "John Helmert III" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "John Helmert III" Message-ID: <1664299862.9badece6035892cc705ff09dca318c5a59473ae8.ajak@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/files/, app-emulation/qemu/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/qemu/files/qemu-7.1.0-capstone-include-path.patch app-emulation/qemu/qemu-7.1.0.ebuild X-VCS-Directories: app-emulation/qemu/files/ app-emulation/qemu/ X-VCS-Committer: ajak X-VCS-Committer-Name: John Helmert III X-VCS-Revision: 9badece6035892cc705ff09dca318c5a59473ae8 X-VCS-Branch: master Date: Tue, 27 Sep 2022 17:31:07 +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: cb0ff308-28aa-45c5-8fbb-3e81a5b5e105 X-Archives-Hash: dae6a1e01d44208a95c5fa1eb7d6ff0f commit: 9badece6035892cc705ff09dca318c5a59473ae8 Author: John Helmert III gentoo org> AuthorDate: Tue Sep 27 17:30:25 2022 +0000 Commit: John Helmert III gentoo org> CommitDate: Tue Sep 27 17:31:02 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9badece6 app-emulation/qemu: fix configure failure with USE=capstone Closes: https://bugs.gentoo.org/873157 Signed-off-by: John Helmert III gentoo.org> .../files/qemu-7.1.0-capstone-include-path.patch | 31 ++++++++++++++++++++++ app-emulation/qemu/qemu-7.1.0.ebuild | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) 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 ++#include + + #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 ', ++ if capstone.found() and not cc.compiles('#include ', + dependencies: [capstone]) + capstone = not_found + if get_option('capstone').enabled() diff --git a/app-emulation/qemu/qemu-7.1.0.ebuild b/app-emulation/qemu/qemu-7.1.0.ebuild index 499aa3a68895..82e527f614ec 100644 --- a/app-emulation/qemu/qemu-7.1.0.ebuild +++ b/app-emulation/qemu/qemu-7.1.0.ebuild @@ -303,11 +303,11 @@ RDEPEND="${CDEPEND} )" PATCHES=( - "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch "${FILESDIR}"/${PN}-6.0.0-make.patch "${FILESDIR}"/${PN}-7.1.0-also-build-virtfs-proxy-helper.patch "${FILESDIR}"/${PN}-7.1.0-strings.patch + "${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch ) QA_PREBUILT="