File gcc5-real-support.patch of Package virtualbox

Overview Repositories Revisions Requests Users Attributes Meta

File gcc5-real-support.patch of Package virtualbox (Revision 46a01c6f2c92c39c68c6d86cccde1cad)

Currently displaying revision 46a01c6f2c92c39c68c6d86cccde1cad , Show latest

Index: VirtualBox-5.1.10/Config.kmk
===================================================================
--- VirtualBox-5.1.10.orig/Config.kmk
+++ VirtualBox-5.1.10/Config.kmk
@@ -2479,7 +2479,7 @@ else
  # Some versions of gcc (e.g. openSUSE11) return only major.minor on `gcc -dumpversion`.
  # gcc-5 of openSUSE42.1 only returns the major version on `gcc -dumpversion`!
  VBOX_GCC_VERSION = $(shell \
-    $(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))|' )
+   $(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
Index: VirtualBox-5.1.10/configure
===================================================================
--- VirtualBox-5.1.10.orig/configure
+++ VirtualBox-5.1.10/configure
@@ -433,8 +433,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

Places

File gcc5-real-support.patch of Package virtualbox (Revision 46a01c6f2c92c39c68c6d86cccde1cad)

Places