From cf4c00c2558d375dd0725d3038e16d214f15c45f Mon Sep 17 00:00:00 2001 From: Björn Esser Date: Jan 15 2019 10:34:24 +0000 Subject: Add a patch to fix build on Fedora 30 --- diff --git a/VirtualBox-6.0.0-fix-build.patch b/VirtualBox-6.0.0-fix-build.patch new file mode 100644 index 0000000..1d79800 --- /dev/null +++ b/VirtualBox-6.0.0-fix-build.patch @@ -0,0 +1,30 @@ +Index: VirtualBox-6.0.0/src/VBox/Runtime/r3/linux/semevent-linux.cpp +=================================================================== +--- VirtualBox-6.0.0.orig/src/VBox/Runtime/r3/linux/semevent-linux.cpp ++++ VirtualBox-6.0.0/src/VBox/Runtime/r3/linux/semevent-linux.cpp +@@ -37,7 +37,9 @@ + * against glibc < 2.6. + */ + #include "../posix/semevent-posix.cpp" +-asm volatile (".global epoll_pwait"); ++/* Fedora is guaranteed to ship glibc > 2.6 ++ * asm volatile (".global epoll_pwait"); ++ */ + + #else /* glibc < 2.6 */ + +Index: VirtualBox-6.0.0/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp +=================================================================== +--- VirtualBox-6.0.0.orig/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp ++++ VirtualBox-6.0.0/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp +@@ -39,7 +39,9 @@ + * against glibc < 2.6. + */ + #include "../posix/semeventmulti-posix.cpp" +-asm volatile (".global epoll_pwait"); ++/* Fedora is guaranteed to ship glibc > 2.6 ++ * asm volatile (".global epoll_pwait"); ++ */ + + #else /* glibc < 2.6 */ + diff --git a/virtualbox-guest-additions.spec b/virtualbox-guest-additions.spec index 72b70a5..4a3852f 100644 --- a/virtualbox-guest-additions.spec +++ b/virtualbox-guest-additions.spec @@ -21,6 +21,8 @@ Patch3: VirtualBox-5.2.10-xclient.patch #Patch4: VirtualBox-5.2.6-gcc8.patch # From Archlinux Patch10: 010-linux-4.16-mount-fixes.patch +# To fix build with Fedora 30. +Patch11: VirtualBox-6.0.0-fix-build.patch BuildRequires: gcc-c++ BuildRequires: kBuild >= 0.1.9998.r3093 @@ -198,6 +200,7 @@ getent passwd vboxadd >/dev/null || \ %changelog * Mon Jan 14 2019 Björn Esser - 6.0.0-2 - Rebuilt for libcrypt.so.2 (#1666033) +- Add a patch to fix build on Fedora 30 * Thu Dec 20 2018 Sérgio Basto - 6.0.0-1 - VirtualBox 6.0.0