SPECS (AC-branch): openoffice.org.spec - add gcc4 bcond

[glen]

Author: glen                         Date: Sun Mar 18 12:21:49 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- add gcc4 bcond

---- Files affected:
SPECS:
   openoffice.org.spec (1.704.2.34 -> 1.704.2.35) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.704.2.34 SPECS/openoffice.org.spec:1.704.2.35
--- SPECS/openoffice.org.spec:1.704.2.34	Sat Mar 17 15:33:05 2007
+++ SPECS/openoffice.org.spec	Sun Mar 18 13:21:41 2007
@@ -38,6 +38,7 @@
 %bcond_with	mono		# enable compilation of mono bindings
 %bcond_without	mozilla		# without mozilla components
 %bcond_without	i18n		# do not create i18n packages
+%bcond_with	gcc4		# build with gcc4
 
 %bcond_without	system_beanshell
 %bcond_without	system_db		# without system (i.e. with internal) Berkeley DB
@@ -164,7 +165,8 @@
 BuildRequires:	libicu-devel >= 3.4
 BuildRequires:	libjpeg-devel
 BuildRequires:	libsndfile-devel
-BuildRequires:	libstdc++-devel >= 5:3.2.1
+%{!?with_gcc4:BuildRequires:	libstdc++-devel >= 5:3.2.1}
+%{?with_gcc4:BuildRequires:	libstdc++-devel >= 5:4.1.1}
 BuildRequires:	libwpd-devel >= 0.8.6
 BuildRequires:	libxml2-devel >= 2.0
 %{?with_system_mdbtools:BuildRequires:	mdbtools-devel >= 0.6}
@@ -224,13 +226,20 @@
 Requires:	%{name}-writer = %{epoch}:%{version}-%{release}
 Requires:	%{name}-xsltfilter = %{epoch}:%{version}-%{release}
 Requires:	fonts-TTF-OpenSymbol = %{epoch}:%{version}-%{release}
-ExclusiveArch:	%{ix86} ppc sparc sparcv9
+ExclusiveArch:	%{ix86} %{?with_gcc4:%{x8664}} ppc sparc sparcv9
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # No ELF objects there to strip/chrpath (skips processing 17k files totaling 415M)
 %define		_noautostrip	.*%{_datadir}/%{name}/.*
 %define		_noautochrpath	.*%{_datadir}/%{name}/.*
 
+%if %{with gcc4}
+# add suffix, but allow ccache, etc in ~/.rpmmacros
+%{expand:%%define	__cc	%(echo '%__cc' | sed -e 's,-gcc,-gcc4,')}
+%{expand:%%define	__cxx	%(echo '%__cxx' | sed -e 's,-g++,-g++4,')}
+%{expand:%%define	__cpp	%(echo '%__cpp' | sed -e 's,-gcc,-gcc4,')}
+%endif
+
 %description
 OpenOffice.org is an open-source project sponsored by Sun Microsystems
 and hosted by CollabNet. In October of 2000, Sun released the source
@@ -2082,6 +2091,18 @@
 	exit 1
 fi
 
+# this has to be here, it work if placed elsewhere in spec
+%if %{with gcc4}
+# add suffix, but allow ccache, etc in ~/.rpmmacros
+%{expand:%%define	__cc	%(echo '%__cc' | sed -e 's,-gcc,-gcc4,')}
+%{expand:%%define	__cxx	%(echo '%__cxx' | sed -e 's,-g++,-g++4,')}
+%{expand:%%define	__cpp	%(echo '%__cpp' | sed -e 's,-gcc,-gcc4,')}
+%endif
+
+export CC="%{__cc}"
+export CXX="%{__cxx}"
+export CPP="%{__cpp}"
+
 %{__aclocal}
 %{__autoconf}
 
@@ -2091,8 +2112,6 @@
 DISTRO="PLD"
 %endif
 
-export CC="%{__cc}"
-export CXX="%{__cxx}"
 export ENVCFLAGS="%{rpmcflags}"
 # disable STLport 5.1 containers extension, doesn't work with map indexed by enum
 export ENVCFLAGSCXX="%{rpmcflags} -fpermissive -D_STLP_NO_CONTAINERS_EXTENSION"
@@ -2245,6 +2264,9 @@
 
 # main build
 %configure \
+	CC="$CC" \
+	CXX="$CXX" \
+	CPP="$CPP" \
 	$CONFOPTS
 
 # this limits processing some files but doesn't limit parallel build
@@ -3875,6 +3897,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.704.2.35  2007/03/18 12:21:41  glen
+- add gcc4 bcond
+
 Revision 1.704.2.34  2007/03/17 14:33:05  hawk
 - release 8
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.704.2.34&r2=1.704.2.35&f=u