forked from pool/virtualbox
77d1328616
* Major bump from 4 series with tons of changes. * Read upstream changelog for in-depth informations - Obsoleted patches: * gcc5-support.patch * gcc51-support.patch - Refreshed patches: * gcc5-real-support.patch * vbox-disable-updates.diff * virtualbox-system-x.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=206
32 lines
1.6 KiB
Diff
32 lines
1.6 KiB
Diff
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
|