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 0C26F158094 for ; Tue, 5 Jul 2022 01:05:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1FE7E0A8D; Tue, 5 Jul 2022 01:05:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 C4157E0A8D for ; Tue, 5 Jul 2022 01:05:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 A584D3418EF for ; Tue, 5 Jul 2022 01:05:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 10D9051F for ; Tue, 5 Jul 2022 01:05:21 +0000 (UTC) From: "WANG Xuerui" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "WANG Xuerui" Message-ID: <1656982433.e7e343979dbfd7e4b4fcf85f36c17d414fc1e41e.xen0n@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-strings.patch app-emulation/qemu/qemu-9999.ebuild X-VCS-Directories: app-emulation/qemu/ app-emulation/qemu/files/ X-VCS-Committer: xen0n X-VCS-Committer-Name: WANG Xuerui X-VCS-Revision: e7e343979dbfd7e4b4fcf85f36c17d414fc1e41e X-VCS-Branch: master Date: Tue, 5 Jul 2022 01:05:21 +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: 75c10806-8f1d-4c36-a6ce-08ae67f800ae X-Archives-Hash: 441add4e01cbc838d824b975ff8db149 commit: e7e343979dbfd7e4b4fcf85f36c17d414fc1e41e Author: WANG Xuerui gentoo org> AuthorDate: Tue Jul 5 00:39:29 2022 +0000 Commit: WANG Xuerui gentoo org> CommitDate: Tue Jul 5 00:53:53 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7e34397 app-emulation/qemu: forward port 6.1.0-strings.patch to latest main branch Due to upstream commit https://gitlab.com/qemu-project/qemu/-/commit/158bb2249ed9 ("configure: Add cross prefix for widl tool"). Tentatively named 7.1.0, as 7.1.0 will be the first upstream version this forwarded patch is applicable to. Signed-off-by: WANG Xuerui gentoo.org> app-emulation/qemu/files/qemu-7.1.0-strings.patch | 26 +++++++++++++++++++++++ app-emulation/qemu/qemu-9999.ebuild | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/app-emulation/qemu/files/qemu-7.1.0-strings.patch b/app-emulation/qemu/files/qemu-7.1.0-strings.patch new file mode 100644 index 000000000000..01f235b9a33c --- /dev/null +++ b/app-emulation/qemu/files/qemu-7.1.0-strings.patch @@ -0,0 +1,26 @@ +Forward-ported from original patch for 5.2.0. + +diff --git a/configure b/configure +index da2501489f..4660ee3ee5 100755 +--- a/configure ++++ b/configure +@@ -400,6 +400,7 @@ ld="${LD-${cross_prefix}ld}" + nm="${NM-${cross_prefix}nm}" + smbd="$SMBD" + strip="${STRIP-${cross_prefix}strip}" ++strings="${STRINGS-${cross_prefix}strings}" + widl="${WIDL-${cross_prefix}widl}" + windres="${WINDRES-${cross_prefix}windres}" + pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}" +@@ -1466,9 +1467,9 @@ int main(int argc, char *argv[]) + EOF + + if compile_prog ; then +- if strings -a $TMPE | grep -q BiGeNdIaN ; then ++ if $strings -a $TMPE | grep -q BiGeNdIaN ; then + bigendian="yes" +- elif strings -a $TMPE | grep -q LiTtLeEnDiAn ; then ++ elif $strings -a $TMPE | grep -q LiTtLeEnDiAn ; then + bigendian="no" + else + echo big/little test failed diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 33c2357b1386..4b02fd9f5f85 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -278,8 +278,8 @@ 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}-6.1.0-strings.patch "${FILESDIR}"/${PN}-7.0.0-also-build-virtfs-proxy-helper.patch + "${FILESDIR}"/${PN}-7.1.0-strings.patch ) QA_PREBUILT="