File gcc5-real-support.patch of Package virtualbox

Overview Repositories Revisions Requests Users Attributes Meta

File gcc5-real-support.patch of Package virtualbox (Revision 4b2f5b88c291803232baeca156232ee2)

Currently displaying revision 4b2f5b88c291803232baeca156232ee2 , Show latest

diff -urN VirtualBox-5.0.0.old/Config.kmk VirtualBox-5.0.0/Config.kmk
--- VirtualBox-5.0.0.old/Config.kmk	2015-07-11 13:17:27.273698360 +0200
+++ VirtualBox-5.0.0/Config.kmk	2015-07-11 13:36:31.958812088 +0200
@@ -2344,7 +2344,7 @@
  # 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
diff -urN VirtualBox-5.0.0.old/configure VirtualBox-5.0.0/configure
--- VirtualBox-5.0.0.old/configure	2015-07-11 13:17:27.273698360 +0200
+++ VirtualBox-5.0.0/configure	2015-07-11 13:37:30.457915488 +0200
@@ -410,8 +410,13 @@
         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 4b2f5b88c291803232baeca156232ee2)

Places