Accepting request 308894 from home:jirislaby:branches:Virtualization

initial gcc5 support (it builds at least)

OBS-URL: https://build.opensuse.org/request/show/308894
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=195

gcc5-real-support.patch

@@ -0,0 +1,34 @@
+---
+ Config.kmk |    2 +-
+ configure  |    9 +++++++--
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+--- a/Config.kmk
++++ b/Config.kmk
+@@ -2292,7 +2292,7 @@ else
+  # The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)).
+  # Some versions of gcc (e.g. openSUSE11) return only major.minor on `gcc -dumpversion`.
+  VBOX_GCC_VERSION = $(shell \
+-    $(1) -dumpversion | $(SED_EXT) 's|\([0-9]\)\.\([0-9]\)\.\{0,1\}\([0-9]\{0,1\}\).*|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, \2), $$(firstword \3 0))|' )
++    $(1) -dumpversion | $(SED_EXT) 's|\([0-9]\)\.\{0,1\}\([0-9]\{0,1\}\)\.\{0,1\}\([0-9]\{0,1\}\).*|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, $$(firstword \2 0)), $$(firstword \3 0))|' )
+ endif
+ 
+ # Find MinGW cross compilers for EFI on non-windows systems. We need to probe
+--- a/configure
++++ b/configure
+@@ -409,8 +409,13 @@ check_gcc()
+         log_failure "cannot execute '$CXX -dumpversion'"
+         fail really
+       fi
+-      cc_maj=`echo $cc_ver|cut -d. -f1`
+-      cc_min=`echo $cc_ver|cut -d. -f2`
++      if echo $cc_ver | grep -q '\.'; then
++        cc_maj=`echo $cc_ver|cut -d. -f1`
++        cc_min=`echo $cc_ver|cut -d. -f2`
++      else
++        cc_maj=$cc_ver
++        cc_min=0
++      fi
+       if [ "x$cc_ver" != "x$cxx_ver" ]; then
+         log_failure "gcc version $cc_ver does not match g++ version $cxx_ver"
+         fail really

gcc5-support.patch

@@ -0,0 +1,16 @@
+Index: configure
+===================================================================
+--- configure	(revision 55371)
++++ configure	(revision 55372)
+@@ -422,8 +422,9 @@
+              -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \
+              -o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \
+              -o \( $cc_maj -eq 4 -a $cc_min -gt 9 \) \
+-             -o $cc_maj -gt 4 ]; then
+-        log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<10"
++             -o \( $cc_maj -eq 5 -a $cc_min -gt 0 \) \
++             -o $cc_maj -gt 5 ]; then
++        log_failure "gcc version $cc_maj.$cc_min found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<10 or gcc 5.0"
+         fail really
+       else
+         log_success "found version $cc_ver"

gcc51-support.patch

@@ -0,0 +1,16 @@
+Index: configure
+===================================================================
+--- configure	(revision 55388)
++++ configure	(revision 55389)
+@@ -422,9 +422,9 @@
+              -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \
+              -o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \
+              -o \( $cc_maj -eq 4 -a $cc_min -gt 9 \) \
+-             -o \( $cc_maj -eq 5 -a $cc_min -gt 0 \) \
++             -o \( $cc_maj -eq 5 -a $cc_min -gt 1 \) \
+              -o $cc_maj -gt 5 ]; then
+-        log_failure "gcc version $cc_maj.$cc_min found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<10 or gcc 5.0"
++        log_failure "gcc version $cc_maj.$cc_min found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<10 or gcc 5.1"
+         fail really
+       else
+         log_success "found version $cc_ver"

virtualbox.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed May 27 10:22:22 UTC 2015 - jslaby@suse.com
+
+- initial gcc5 support (it builds at least)
+  * added: gcc5-support.patch (upstream)
+  * added: gcc51-support.patch (upstream)
+  * added: gcc5-real-support.patch
+
 -------------------------------------------------------------------
 Tue May 19 15:09:12 UTC 2015 - mpluskal@suse.com
 

virtualbox.spec

@@ -75,6 +75,9 @@ Patch103:       vbox-disable-updates.diff
 Patch104:       vbox-fpie.diff
 #smap issues on Haswell or Broadwell (boo#931461)
 Patch105:       smap.diff
+Patch106:       gcc5-support.patch
+Patch107:       gcc51-support.patch
+Patch108:       gcc5-real-support.patch
 BuildRequires:  LibVNCServer-devel
 BuildRequires:  SDL-devel
 BuildRequires:  acpica
@@ -296,6 +299,9 @@ This package contains icons for guest desktop files that were created on the des
 %patch103
 %patch104 -p1
 %patch105 -p1
+%patch106
+%patch107
+%patch108 -p1
 #copy user manual
 cp %{SOURCE1} UserManual.pdf
 #copy kbuild config