Accepting request 70161 from home:elvigia:branches:Virtualization
- Allow GCC 4.6 to be used OBS-URL: https://build.opensuse.org/request/show/70161 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=45
This commit is contained in:
parent
f816fe0ce6
commit
122495aaba
11
vbox-gcc46.patch
Normal file
11
vbox-gcc46.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- configure.orig
|
||||||
|
+++ configure
|
||||||
|
@@ -412,7 +412,7 @@ check_gcc()
|
||||||
|
elif [ $cc_maj -lt 3 \
|
||||||
|
-o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \
|
||||||
|
-o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \
|
||||||
|
- -o \( $cc_maj -eq 4 -a $cc_min -gt 5 \) \
|
||||||
|
+ -o \( $cc_maj -eq 4 -a $cc_min -gt 6 \) \
|
||||||
|
-o $cc_maj -gt 4 ]; then
|
||||||
|
log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<5"
|
||||||
|
fail really
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri May 13 03:29:45 UTC 2011 - crrodriguez@opensuse.org
|
||||||
|
|
||||||
|
- Allow GCC 4.6 to be used
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Apr 26 19:42:44 UTC 2011 - crrodriguez@opensuse.org
|
Tue Apr 26 19:42:44 UTC 2011 - crrodriguez@opensuse.org
|
||||||
|
|
||||||
|
@ -94,6 +94,7 @@ Patch101: vbox-default-os-type.diff
|
|||||||
#disable update in vbox gui
|
#disable update in vbox gui
|
||||||
Patch102: vbox-disable-updates.diff
|
Patch102: vbox-disable-updates.diff
|
||||||
Patch103: virtualbox-ose_%{version}-dfsg-1.diff.gz
|
Patch103: virtualbox-ose_%{version}-dfsg-1.diff.gz
|
||||||
|
Patch104: vbox-gcc46.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
PreReq: pwdutils permissions
|
PreReq: pwdutils permissions
|
||||||
Requires: %{name}-host-kmp = %version
|
Requires: %{name}-host-kmp = %version
|
||||||
@ -218,6 +219,7 @@ quilt push -a
|
|||||||
%patch100
|
%patch100
|
||||||
%patch101
|
%patch101
|
||||||
%patch102 -p1
|
%patch102 -p1
|
||||||
|
%patch104
|
||||||
#copy user manual
|
#copy user manual
|
||||||
%__cp %{S:1} ./UserManual.pdf
|
%__cp %{S:1} ./UserManual.pdf
|
||||||
|
|
||||||
@ -242,7 +244,7 @@ source env.sh
|
|||||||
# VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= just disable some functionality in gui
|
# VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= just disable some functionality in gui
|
||||||
# -j1 disable parallel build to avoid "Out of memory: Kill process" crash of build in buildservice
|
# -j1 disable parallel build to avoid "Out of memory: Kill process" crash of build in buildservice
|
||||||
/usr/bin/kmk \
|
/usr/bin/kmk \
|
||||||
-j1 \
|
-j2 \
|
||||||
VBOX_GCC_WERR= \
|
VBOX_GCC_WERR= \
|
||||||
KBUILD_VERBOSE=2 \
|
KBUILD_VERBOSE=2 \
|
||||||
VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \
|
VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user