[gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/, app-emulation/virtualbox/files/

["Sam James" <sam@gentoo.org>]

commit:     30a5e942654517bbb07962187a4a619b281ff3ca
Author:     Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
AuthorDate: Wed Aug 17 06:52:07 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 18:42:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30a5e942

app-emulation/virtualbox: Fix compilation with -fcf-protection

Closes: https://bugs.gentoo.org/865361
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26889
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/virtualbox-6.1.36-fcf-protection.patch         | 16 ++++++++++++++++
 app-emulation/virtualbox/virtualbox-6.1.36-r1.ebuild     |  3 +++
 2 files changed, 19 insertions(+)

diff --git a/app-emulation/virtualbox/files/virtualbox-6.1.36-fcf-protection.patch b/app-emulation/virtualbox/files/virtualbox-6.1.36-fcf-protection.patch
new file mode 100644
index 000000000000..14b11f734c71
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-6.1.36-fcf-protection.patch
@@ -0,0 +1,16 @@
+Bug https://bugs.gentoo.org/865361
+
+gcc does not support -fcf-protection for i386 (needs i686+),
+so disable it when building iPxeBaseBin.
+
+--- a/src/VBox/Devices/PC/ipxe/Makefile.kmk
++++ b/src/VBox/Devices/PC/ipxe/Makefile.kmk
+@@ -176,6 +177,8 @@
+ 
+  iPxeBaseBin_TEMPLATE = iPxe
+ 
++ iPxeBaseBin_CFLAGS = -fcf-protection=none
++
+  iPxeBaseBin_INCS = \
+ 	src \
+ 	src/include \

diff --git a/app-emulation/virtualbox/virtualbox-6.1.36-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.36-r1.ebuild
index c0b33deec69b..e964abdd6906 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.36-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.36-r1.ebuild
@@ -172,6 +172,9 @@ PATCHES=(
 	# Patch grabbed from Arch Linux / upstream for Python 3.10 support
 	"${FILESDIR}"/${PN}-6.1.36-python3.10.patch
 
+	# 865361
+	"${FILESDIR}"/${PN}-6.1.36-fcf-protection.patch
+
 	# Downloaded patchset
 	"${WORKDIR}"/virtualbox-patches-${MY_PV}/patches
 )