[packages/VirtualBox] upstream patch to fix build with gcc8; rel 3
atler
atler at pld-linux.org
Wed Aug 15 17:45:24 CEST 2018
commit 570c58c4622b534ff8a4fc3da47cb5c9565b87ca
Author: Jan Palus <atler at pld-linux.org>
Date: Wed Aug 15 17:39:18 2018 +0200
upstream patch to fix build with gcc8; rel 3
VirtualBox.spec | 4 +++-
gcc8.patch | 27 +++++++++++++++++++++++++++
2 files changed, 30 insertions(+), 1 deletion(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 0de66fd..4426efa 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -42,7 +42,7 @@ exit 1
%define qtver 5.6.0
-%define rel 2
+%define rel 3
%define pname VirtualBox
Summary: VirtualBox - x86 hardware virtualizer
Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86
@@ -83,6 +83,7 @@ Patch15: %{pname}-lightdm-1.19.2.patch
Patch16: %{pname}-no-vboxvideo.patch
Patch17: %{pname}-kerndir.patch
Patch18: kernel-4.18.patch
+Patch19: gcc8.patch
URL: http://www.virtualbox.org/
%if %{with userspace}
%ifarch %{x8664}
@@ -553,6 +554,7 @@ cd ../..\
%patch16 -p0
%patch17 -p1
%patch18 -p1
+%patch19 -p0
%{__sed} -i -e 's, at VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
-e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in
diff --git a/gcc8.patch b/gcc8.patch
new file mode 100644
index 0000000..9f3d19e
--- /dev/null
+++ b/gcc8.patch
@@ -0,0 +1,27 @@
+------------------------------------------------------------------------
+r73343 | vboxsync | 2018-07-25 08:39:58 +0200 (śro, 25 lip 2018) | 3 lines
+Changed paths:
+ M /trunk/configure
+
+configure: remove the upper version limit in the gcc test and plan to
+blacklist if necessary in future.
+Thank you Gianfranco Costamagna.
+
+Index: configure
+===================================================================
+--- configure (revision 73342)
++++ configure (revision 73343)
+@@ -446,9 +446,8 @@
+ # gcc-4.0 is allowed for Darwin only
+ elif [ $cc_maj -lt 4 \
+ -o \( $cc_maj -eq 4 -a $cc_min -lt 4 -a "$OS" != "darwin" \) \
+- -o \( $cc_maj -eq 4 -a $cc_min -lt 2 -a "$OS" = "darwin" \) \
+- -o $cc_maj -gt 7 ]; then
+- log_failure "gcc version $cc_maj.$cc_min found, expected gcc 4.x...7.x"
++ -o \( $cc_maj -eq 4 -a $cc_min -lt 2 -a "$OS" = "darwin" \) ]; then
++ log_failure "gcc version $cc_maj.$cc_min found, expected gcc 4.x or later"
+ fail really
+ else
+ log_success "found version $cc_ver"
+
+------------------------------------------------------------------------
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/570c58c4622b534ff8a4fc3da47cb5c9565b87ca
More information about the pld-cvs-commit
mailing list