SPECS: VirtualBox.spec - use separate compiler (3.4) for building op.c

[arekm]

Author: arekm                        Date: Tue Aug  5 07:01:35 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use separate compiler (3.4) for building op.c

---- Files affected:
SPECS:
   VirtualBox.spec (1.108 -> 1.109) 

---- Diffs:

================================================================
Index: SPECS/VirtualBox.spec
diff -u SPECS/VirtualBox.spec:1.108 SPECS/VirtualBox.spec:1.109
--- SPECS/VirtualBox.spec:1.108	Tue Aug  5 08:57:19 2008
+++ SPECS/VirtualBox.spec	Tue Aug  5 09:01:30 2008
@@ -25,7 +25,8 @@
 
 %if "%{pld_release}" != "ti"
 %define		__ucc	gcc-3.4
-%define		__ucxx	g++-3.4
+%else
+%define		__ucc	%{__cc}
 %endif
 
 %define		pname	VirtualBox
@@ -52,6 +53,7 @@
 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
@@ -62,8 +64,6 @@
 BuildRequires:	gcc >= 5:3.2.3
 %if "%{pld_release}" != "ti"
 BuildRequires:	compat-gcc-34
-BuildRequires:	compat-gcc-34-c++
-BuildRequires:	compat-gcc-34-libstdc++-devel
 %endif
 BuildRequires:	iasl
 %endif
@@ -262,6 +262,7 @@
 %endif
 
 %patch4 -p1
+%patch5 -p0
 
 cat <<'EOF' > udev.conf
 KERNEL=="vboxdrv", NAME="%k", GROUP="vbox", MODE="0660"
@@ -284,17 +285,13 @@
 %build
 %if %{with userspace}
 ./configure \
-%if "%{pld_release}" == "ti"
 	--with-gcc="%{__cc}" \
 	--with-g++="%{__cxx}" \
-%else
-	--with-gcc="%{__ucc}" \
-	--with-g++="%{__ucxx}" \
-%endif
 	--disable-qt4 \
 	--disable-kmods
 
-. ./env.sh && kmk -j1
+. ./env.sh && \
+kmk -j1 VBOX_RECOMPILER_OP_GCC_PLD_COMPAT="%{__ucc}"
 %endif
 
 %if %{with kernel}
@@ -517,6 +514,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.109  2008/08/05 07:01:30  arekm
+- use separate compiler (3.4) for building op.c
+
 Revision 1.108  2008/08/05 06:57:19  hawk
 - updated to 1.6.4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/VirtualBox.spec?r1=1.108&r2=1.109&f=u