File gcc5-real-support.patch of Package virtualbox.6025

Overview Repositories Revisions Requests Users Attributes Meta

File gcc5-real-support.patch of Package virtualbox.6025

---
 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

Places

File gcc5-real-support.patch of Package virtualbox.6025

Places