From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 073131580EB for ; Fri, 23 May 2025 04:49:03 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id E4C55343467 for ; Fri, 23 May 2025 04:49:02 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id E44A01103DE; Fri, 23 May 2025 04:48:59 +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 bobolink.gentoo.org (Postfix) with ESMTPS id D69FA1103DE for ; Fri, 23 May 2025 04:48:59 +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 8B100343458 for ; Fri, 23 May 2025 04:48:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B800A198A for ; Fri, 23 May 2025 04:48:57 +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: <1747975634.b7b382d62a4e6a976bfe479c2cb37635b99592d0.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/xen-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/xen-tools/xen-tools-4.19.2-r1.ebuild X-VCS-Directories: app-emulation/xen-tools/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b7b382d62a4e6a976bfe479c2cb37635b99592d0 X-VCS-Branch: master Date: Fri, 23 May 2025 04:48:57 +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: a3519813-200b-48e5-9d08-43f0a719affd X-Archives-Hash: 09962ef168addedd24084c49c83fd6ee commit: b7b382d62a4e6a976bfe479c2cb37635b99592d0 Author: Z. Liu gmail com> AuthorDate: Fri May 23 03:27:59 2025 +0000 Commit: Sam James gentoo org> CommitDate: Fri May 23 04:47:14 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7b382d6 app-emulation/xen-tools: apply patch of 4.19.1 from commit 085af7dfb91c441435b7d5f2b0b387b6369baf68 to fix build failure if using clang Signed-off-by: Z. Liu gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42221 Closes: https://github.com/gentoo/gentoo/pull/42221 Signed-off-by: Sam James gentoo.org> app-emulation/xen-tools/xen-tools-4.19.2-r1.ebuild | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app-emulation/xen-tools/xen-tools-4.19.2-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.19.2-r1.ebuild index d0d09c2d0a93..78f8165f23ae 100644 --- a/app-emulation/xen-tools/xen-tools-4.19.2-r1.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.19.2-r1.ebuild @@ -163,7 +163,9 @@ DEPEND="${COMMON_DEPEND} BDEPEND="dev-lang/perl app-alternatives/yacc - sys-devel/gettext" + sys-devel/gettext + ipxe? ( sys-devel/gcc:* ) + !system-seabios? ( sys-devel/gcc:* )" # hvmloader is used to bootstrap a fully virtualized kernel # Approved by QA team in bug #144032 @@ -280,7 +282,9 @@ src_prepare() { # gcc 11 cp "${XEN_GENTOO_PATCHES_DIR}/ipxe/${PN}-4.15.0-ipxe-gcc11.patch" tools/firmware/etherboot/patches/ipxe-gcc11.patch || die + cp "${FILESDIR}/ipxe-force-gcc.patch" tools/firmware/etherboot/patches/ || die echo ipxe-gcc11.patch >> tools/firmware/etherboot/patches/series || die + echo ipxe-force-gcc.patch >> tools/firmware/etherboot/patches/series || die fi # Fix texi2html build error with new texi2html, qemu.doc.html @@ -405,6 +409,10 @@ src_prepare() { tools/firmware/ovmf-dir-remote/BaseTools/Source/C/VfrCompile/Pccts/*/makefile || die fi + if ! use system-seabios ; then + sed -i "/^export HOSTCC/i override CC:=gcc" tools/firmware/seabios-dir/Makefile || die + fi + default }