Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21317
Modified Files:
VirtualBox-OSE.spec
Added Files:
VirtualBox-OSE-4.0.2-gcc46.patch
Log Message:
Naive attempt to fix gcc-4.6 build
VirtualBox-OSE-4.0.2-gcc46.patch:
configure | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- NEW FILE VirtualBox-OSE-4.0.2-gcc46.patch ---
From fb2a3a2773905364fe3b8ee0ebd36c28e65da78a Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Tue, 8 Feb 2011 22:15:09 +0100
Subject: [PATCH] Allow building with gcc-4.6
---
configure | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index d365e48..f97b822 100755
--- a/configure
+++ b/configure
@@ -409,9 +409,9 @@ 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"
+ log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc
4.x with 0<x<6"
fail really
else
log_success "found version $cc_ver"
--
1.7.3.4
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- VirtualBox-OSE.spec 4 Feb 2011 17:14:54 -0000 1.65
+++ VirtualBox-OSE.spec 8 Feb 2011 21:17:32 -0000 1.66
@@ -15,7 +15,7 @@
Name: VirtualBox-OSE
Version: 4.0.2
-Release: 1%{?prerel:.%{prerel}}%{?dist}
+Release: 2%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -41,6 +41,7 @@
Patch16: VirtualBox-OSE-4.0.0-usblib.patch
Patch17: VirtualBox-OSE-4.0.0-beramono.patch
Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
+Patch19: VirtualBox-OSE-4.0.2-gcc46.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -153,6 +154,7 @@
%patch16 -p1 -b .usblib
%patch17 -p1 -b .beramono
%patch18 -p1 -b .aiobug
+%patch19 -p1 -b .gcc46
# Remove prebuilt binary tools
rm -rf kBuild
@@ -459,6 +461,9 @@
%changelog
+* Tue Feb 08 2011 Lubomir Rintel <lkundrak(a)v3.sk> - 4.0.2-2
+- Fix build with GCC 4.6
+
* Fri Feb 04 2011 Lubomir Rintel <lkundrak(a)v3.sk> - 4.0.2-1
- New release