[VirtualBox] Fix build
commit d585bc827e939ff9b671a7c42164a0e7c8c698a8
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Feb 9 00:46:10 2020 +0000
Fix build
Makefile.kmk_hack.patch | 28 ++++++++++++++++++++++++++++
VirtualBox.spec | 2 ++
2 files changed, 30 insertions(+)
---
diff --git a/Makefile.kmk_hack.patch b/Makefile.kmk_hack.patch
new file mode 100644
index 0000000..2457d19
--- /dev/null
+++ b/Makefile.kmk_hack.patch
@@ -0,0 +1,28 @@
+--- ./Makefile.kmk.orig 2020-02-05 00:18:15.751562458 +0000
++++ ./Makefile.kmk 2020-02-05 01:47:17.825333439 +0000
+@@ -169,15 +169,6 @@ ifeq ($(KBUILD_TARGET),darwin)
+ Frameworks/$(qtmod).framework/$(qtmod)=>Versions/5/$(qtmod) \
+ Frameworks/$(qtmod).framework/Resources=>Versions/5/Resources)
+ else # win x11
+- if1of ($(KBUILD_TARGET), linux solaris)
+- ifndef VBOX_ONLY_BUILD
+- ifneq ($(VBOX_GCC_VERSION_CXX),)
+- ifeq ($(int-ge $(VBOX_GCC_VERSION_CXX),40400),)
+- $(error gcc >= 4.4 required when compiling against Qt5!)
+- endif
+- endif
+- endif
+- endif
+ if defined(VBOX_WITH_ORACLE_QT) || defined(VBOX_WITH_QT_PAYLOAD)
+ include $(KBUILD_PATH)/units/qt5.kmk
+ ifeq ($(KBUILD_TARGET),win)
+--- ./src/VBox/Devices/PC/ipxe/Makefile.kmk.orig 2020-02-08 23:53:19.747326051 +0000
++++ ./src/VBox/Devices/PC/ipxe/Makefile.kmk 2020-02-08 23:54:17.038644318 +0000
+@@ -111,6 +111,7 @@ endif
+ TEMPLATE_iPxe_LNK_DEPS = $(VBOX_PATH_IPXE_SRC)/src/arch/i386/scripts/i386.lds
+ TEMPLATE_iPxe_CFLAGS = \
+ -fno-pie \
++ -fcommon \
+ -ffreestanding \
+ -ffunction-sections \
+ -march=i386 \
diff --git a/VirtualBox.spec b/VirtualBox.spec
index b9f4d66..9bcd12e 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -90,6 +90,7 @@ Patch61:
0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
# from OpenSuse
Patch70: vbox-python-detection.diff
+Patch80: Makefile.kmk_hack.patch
BuildRequires: kBuild >= 0.1.9998.r3093
BuildRequires: SDL-devel
@@ -331,6 +332,7 @@ rm -r src/libs/zlib-1.2.*/
%patch60 -p1 -b .xclient
%patch61 -p1 -b .automount
%patch70 -p1 -b .python-detection
+%patch80 -p1 -b .Makefile.kmk_hack.patch
%build
./configure --disable-kmods \