2016-11-21 23:50:08 +01:00
|
|
|
Index: VirtualBox-5.1.10/Config.kmk
|
2016-07-26 18:15:55 +02:00
|
|
|
===================================================================
|
2016-11-21 23:50:08 +01:00
|
|
|
--- VirtualBox-5.1.10.orig/Config.kmk
|
|
|
|
+++ VirtualBox-5.1.10/Config.kmk
|
|
|
|
@@ -2479,7 +2479,7 @@ else
|
2015-05-27 15:07:32 +02:00
|
|
|
# Some versions of gcc (e.g. openSUSE11) return only major.minor on `gcc -dumpversion`.
|
2016-11-21 23:50:08 +01:00
|
|
|
# gcc-5 of openSUSE42.1 only returns the major version on `gcc -dumpversion`!
|
2015-05-27 15:07:32 +02:00
|
|
|
VBOX_GCC_VERSION = $(shell \
|
2016-11-21 23:50:08 +01:00
|
|
|
- $(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))|' )
|
2015-07-11 13:43:54 +02:00
|
|
|
+ $(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))|' )
|
2015-05-27 15:07:32 +02:00
|
|
|
endif
|
|
|
|
|
|
|
|
# Find MinGW cross compilers for EFI on non-windows systems. We need to probe
|
2016-11-21 23:50:08 +01:00
|
|
|
Index: VirtualBox-5.1.10/configure
|
2016-07-26 18:15:55 +02:00
|
|
|
===================================================================
|
2016-11-21 23:50:08 +01:00
|
|
|
--- VirtualBox-5.1.10.orig/configure
|
|
|
|
+++ VirtualBox-5.1.10/configure
|
|
|
|
@@ -433,8 +433,13 @@ check_gcc()
|
2015-05-27 15:07:32 +02:00
|
|
|
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
|