| 1 |
commit: 30a5e942654517bbb07962187a4a619b281ff3ca |
| 2 |
Author: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Aug 17 06:52:07 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 18 18:42:14 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30a5e942 |
| 7 |
|
| 8 |
app-emulation/virtualbox: Fix compilation with -fcf-protection |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/865361 |
| 11 |
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com> |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/26889 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/virtualbox-6.1.36-fcf-protection.patch | 16 ++++++++++++++++ |
| 16 |
app-emulation/virtualbox/virtualbox-6.1.36-r1.ebuild | 3 +++ |
| 17 |
2 files changed, 19 insertions(+) |
| 18 |
|
| 19 |
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 |
| 20 |
new file mode 100644 |
| 21 |
index 000000000000..14b11f734c71 |
| 22 |
--- /dev/null |
| 23 |
+++ b/app-emulation/virtualbox/files/virtualbox-6.1.36-fcf-protection.patch |
| 24 |
@@ -0,0 +1,16 @@ |
| 25 |
+Bug https://bugs.gentoo.org/865361 |
| 26 |
+ |
| 27 |
+gcc does not support -fcf-protection for i386 (needs i686+), |
| 28 |
+so disable it when building iPxeBaseBin. |
| 29 |
+ |
| 30 |
+--- a/src/VBox/Devices/PC/ipxe/Makefile.kmk |
| 31 |
++++ b/src/VBox/Devices/PC/ipxe/Makefile.kmk |
| 32 |
+@@ -176,6 +177,8 @@ |
| 33 |
+ |
| 34 |
+ iPxeBaseBin_TEMPLATE = iPxe |
| 35 |
+ |
| 36 |
++ iPxeBaseBin_CFLAGS = -fcf-protection=none |
| 37 |
++ |
| 38 |
+ iPxeBaseBin_INCS = \ |
| 39 |
+ src \ |
| 40 |
+ src/include \ |
| 41 |
|
| 42 |
diff --git a/app-emulation/virtualbox/virtualbox-6.1.36-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.36-r1.ebuild |
| 43 |
index c0b33deec69b..e964abdd6906 100644 |
| 44 |
--- a/app-emulation/virtualbox/virtualbox-6.1.36-r1.ebuild |
| 45 |
+++ b/app-emulation/virtualbox/virtualbox-6.1.36-r1.ebuild |
| 46 |
@@ -172,6 +172,9 @@ PATCHES=( |
| 47 |
# Patch grabbed from Arch Linux / upstream for Python 3.10 support |
| 48 |
"${FILESDIR}"/${PN}-6.1.36-python3.10.patch |
| 49 |
|
| 50 |
+ # 865361 |
| 51 |
+ "${FILESDIR}"/${PN}-6.1.36-fcf-protection.patch |
| 52 |
+ |
| 53 |
# Downloaded patchset |
| 54 |
"${WORKDIR}"/virtualbox-patches-${MY_PV}/patches |
| 55 |
) |
Archives