Author: hawk Date: Thu Sep 4 19:13:07 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- replaced gcc.patch and compat-gcc hack with configure option
- VirtualBox has switched to qt4 so shall we
- still doesn't build (may be caused by my updated patches, dunno yet)
---- Files affected:
SPECS:
VirtualBox.spec (1.120 -> 1.121)
---- Diffs:
================================================================
Index: SPECS/VirtualBox.spec
diff -u SPECS/VirtualBox.spec:1.120 SPECS/VirtualBox.spec:1.121
--- SPECS/VirtualBox.spec:1.120 Thu Sep 4 20:29:44 2008
+++ SPECS/VirtualBox.spec Thu Sep 4 21:13:01 2008
@@ -13,7 +13,7 @@
%bcond_without userspace # don't build userspace package
%bcond_with verbose
-%define rel 0.1
+%define rel 0.2
%if %{without kernel}
%undefine with_dist_kernel
@@ -23,12 +23,6 @@
%undefine with_userspace
%endif
-%if "%{pld_release}" != "ti"
-%define __ucc gcc-3.4
-%else
-%define __ucc %{__cc}
-%endif
-
%define pname VirtualBox
Summary: VirtualBox OSE - x86 hardware virtualizer
@@ -53,7 +47,6 @@
Patch2: %{pname}-shared-libstdc++.patch
Patch3: %{pname}-disable-xclient-build.patch
Patch4: %{pname}-configure-spaces.patch
-Patch5: %{pname}-gcc.patch
URL: http://www.virtualbox.org/
%if %{with userspace}
BuildRequires: SDL-devel >= 1.2.7
@@ -80,8 +73,8 @@
BuildRequires: libxslt-progs >= 1.1.17
BuildRequires: pkgconfig
BuildRequires: pulseaudio-devel >= 0.9.0
-BuildRequires: qt-devel >= 6:3.3.6
-BuildRequires: qt-linguist
+BuildRequires: qt4-devel >= 4.2.0
+BuildRequires: qt4-linguist
%endif
BuildRequires: rpmbuild(macros) >= 1.379
%if %{with userspace}
@@ -262,7 +255,6 @@
%endif
%patch4 -p1
-%patch5 -p0
cat <<'EOF' > udev.conf
KERNEL=="vboxdrv", NAME="%k", GROUP="vbox", MODE="0660"
@@ -286,12 +278,15 @@
%if %{with userspace}
./configure \
--with-gcc="%{__cc}" \
+%if "%{pld_release}" != "ti"
+ --with-gcc-compat="gcc-3.4" \
+%endif
--with-g++="%{__cxx}" \
- --disable-qt4 \
+ --disable-qt3 \
--disable-kmods
. ./env.sh && \
-kmk -j1 VBOX_RECOMPILER_OP_GCC_PLD_COMPAT="%{__ucc}"
+kmk -j1
%endif
%if %{with kernel}
@@ -514,6 +509,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.121 2008/09/04 19:13:01 hawk
+- replaced gcc.patch and compat-gcc hack with configure option
+- VirtualBox has switched to qt4 so shall we
+- still doesn't build (may be caused by my updated patches, dunno yet)
+
Revision 1.120 2008/09/04 18:29:44 hawk
- updated all patches except gcc one for 2.0.0
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/VirtualBox.spec?r1=1.120&r2=1.121&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
