commit: b7b382d62a4e6a976bfe479c2cb37635b99592d0 Author: Z. Liu <zhixu.liu <AT> gmail <DOT> com> AuthorDate: Fri May 23 03:27:59 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <zhixu.liu <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42221 Closes: https://github.com/gentoo/gentoo/pull/42221 Signed-off-by: Sam James <sam <AT> 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 }
