gentoo auto-resync : 11:04:2025 - 08:43:58next

4 files changed, 25 insertions, 2 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index c4abaa33b959..8cdf9056054c 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 60a2f17f3b5e..e37ee0e10660 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,5 +1,6 @@
 AUX README.gentoo 572 BLAKE2B 1284e49ac0bde0e1c1ad32b7dc200848c0837378224daed628036b5835998c9649574e2b91b4891a610188f01900922d3b2bb23fd6381682c3486bc83be9a9ef SHA512 d7312c11154b3446a66af5e11a9d8e1a30c29e42867b51a073f4460078c9a1b7acb94cea6d38bcd7fdafbb4384856cd11093f41eee1941ca43303a5e21765b03
 AUX edk2-202202-binutils-2.41-textrels.patch 2600 BLAKE2B e3ddfcf36190762cf2589faa777f19f04bc7d3363a226885fa96a17cfbd29f9dd6d6b6501f85080c789b09c34a9174154e2b9dca7f1d1cd274841cf20e8835d2 SHA512 17c01bfc9eb2d2f356e16c08ef5c3def635fd502a9e50692bd5aa3e3a11f999997d0783c8a3b828ede96b34a1e23d4a6d9398607f4a9d0ddc597de3fa2e9a8cf
+AUX ipxe-force-gcc.patch 279 BLAKE2B f7d9f7ab8b45be08c2db0e4a03aa833731dc5f798427185bd0830ebd2a48e2d8c07f8b4b93140abf9a6785b2952778607a7f44441f808f28214812a2a80c607c SHA512 918f931e8a18d564d624b9d7e097e151ff43e2bdf95b5f22ca067a0b485d241851d7606a2a797afd5234de8630c6efd7bcd6712c8fb0f28717de2cf246d2338c
 AUX stubs-32.h 537 BLAKE2B 456f57c4a4ba574c737f1b84b62a085d0290ebc8981a5f96fdebc16b6c86c801c5ca8dde135e803f46c5ec875fdd74770f6ed754880bc7af930b8ce1ce972fb7 SHA512 55308dbedaa91909a2213940f7a7b574cabe6b5a3104761a2a6f28d6aed00164544488c00cbf9d66a9a370a14c6b6d3a00434efd3ff0228cc8e4d81af19c0e68
 AUX xen-consoles.logrotate 63 BLAKE2B 4ae650876035d2815dbcacc6ed618c58cc61d9cfd9cde1b6c2f792cbf51898c577ef979443ad827fc82ced4d21ae24836883160b20d697965ef5377d50c2973c SHA512 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426
 AUX xen-tools-4.19.1-gnu17.patch 314 BLAKE2B 250f194fba156545b04fa251c10083df70b2f39133ee6b9d8827ffd3f90d54015375fdd5222d6e6b66b34f4b7ae8bd68ab27b50d314b9eb33547cb408349c7d1 SHA512 208af691fdcfaa06a300163e80866b728395dec71908a32e4d1effba396916a6ea7edefd38be7b9f970ee18bd368de3ee6825820796953af5262010f5be60a69
@@ -26,5 +27,5 @@ DIST xen-4.19.1.tar.gz 51991715 BLAKE2B 1e16c15c98b0e02ee55129cde3f41b314a4eaaff
 DIST xen-gentoo-patches-4.17.0-gentoo-patchset-2.tar.bz2 4001 BLAKE2B 7afce426759952e202a1dd819fe0a23108072bf9552ba14a0bd787a96ffe5e7a36f37e03dad8db9c46f5731acbc122c258eef6d517816aad9c8db1ca64700d19 SHA512 bcb1479f9ff5e194a4e452da9d0479febc2bcd465b4be69bb8f30e2e6b858fb77a71216dcb3e74dfb65e7ca6513742c294cd6b5eaa5ce82d0b122a00f1cbc450
 DIST xen-upstream-patches-4.18.4-pre-patchset-1.tar.bz2 55216 BLAKE2B 9cc25750cc48db6efbc349278a89cfc3880326ad4556d5dad28a016bbf270435acff606d545420d44a3143ab1f540156c6997ad676d36b3ec3d5e85a63fb495c SHA512 3752998f804c7e1e5dc327a1a84dafbdac6c06eefa404766fc94089521d836a5fecd2f760e229200d4b6267af88f55b119505336be4d57e9fd74457b122f896f
 EBUILD xen-tools-4.18.4_pre1.ebuild 16704 BLAKE2B 0d56623c6d7a6dda3607d1f736d9e0a686c5c8b74401eae07a6bd1163a55b928d2aa2014a6d6e96c06e795b464d9db25eb3b0819c82f39e4925a17cdafbe24b0 SHA512 a940167994d4e05eebba6b9d0ef18c22ac95dfb95e1395088697abc8d679388a473d4a51685bb2546a5a817a10a353e94dd264bf02d82c3027fc4dd1b74c2b50
-EBUILD xen-tools-4.19.1.ebuild 16551 BLAKE2B a6e2e209bd7da9e5de3a631af0fbab25658af37714773182cd46c84ad5d03c1cd7d63493740f3b49e23f74db44cf589329ca2f96315371883500220c08e33939 SHA512 cda95c0aeaf9ff8f831984f73cf837b8c9a7fb8db54688417fe80d66a15d621ce5f38742ff196c2350c688c5e6bcf25089bf31baa816aea764b25f032fbd37e5
+EBUILD xen-tools-4.19.1.ebuild 16901 BLAKE2B 71dc35b66b8a333c42b536f115a7ed9f6aacabbabfbbfd2d303a4ea7c2cbfd7dba194b937545ea6fc214c780c2299ab94e2668e9074259d852baeaa4e64cbe5b SHA512 98525c936d8b6852fe4f6257bf0cfa6fcd8f4cbff1a48398a926cfb1bba848c56c9eb5f797b1bd98aeb897b063edc60db7a0c12cfc56a07599721c42e9b7f612
 MISC metadata.xml 1562 BLAKE2B a619e34e6fec4c6ffc00fd098dc040c5bb464ed7f2032db2e933fada0614e82c21269175f37720a123404551474e2aeeb2728b405ff93f9b4d9d092d027e0839 SHA512 f45c793a4b4819f0e50501ddc85acdaf99e4d675530712f8dccfb5166d071ae8ed07917a61d56037d6ba3a54123f72f4512d8c11643ea8c6e507feb9d29594e7
diff --git a/app-emulation/xen-tools/files/ipxe-force-gcc.patch b/app-emulation/xen-tools/files/ipxe-force-gcc.patch
new file mode 100644
index 000000000000..781de6591356
--- /dev/null
+++ b/app-emulation/xen-tools/files/ipxe-force-gcc.patch
@@ -0,0 +1,14 @@
+diff --git a/src/Makefile b/src/Makefile
+index 548a4e3f..de5ee7ac 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -16,7 +16,8 @@ SYMBOL_PREFIX	:=
+ #
+ # Locations of tools
+ #
+-HOST_CC		:= gcc
++override CC		:= gcc
++HOST_CC		:= ${CC}
+ RM		:= rm -f
+ TOUCH		:= touch
+ MKDIR		:= mkdir
diff --git a/app-emulation/xen-tools/xen-tools-4.19.1.ebuild b/app-emulation/xen-tools/xen-tools-4.19.1.ebuild
index 849888b3e33e..6fe624272471 100644
--- a/app-emulation/xen-tools/xen-tools-4.19.1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.19.1.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
 }