rpms/ghc/FC-3 ghc.spec,1.1,1.2

Jens Petersen (petersen) fedora-extras-commits at redhat.com
Thu May 12 07:52:10 UTC 2005


Author: petersen

Update of /cvs/extras/rpms/ghc/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15509

Modified Files:
	ghc.spec 
Log Message:
remove _with_gcc32 since it is not needed for FC-3



Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/FC-3/ghc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ghc.spec	12 May 2005 07:37:43 -0000	1.1
+++ ghc.spec	12 May 2005 07:52:08 -0000	1.2
@@ -5,9 +5,6 @@
 %define build_prof 1
 %define build_doc 0
 
-# ghc-6.4 doesn't build with gcc-4.0 yet
-%define _with_gcc32 %{nil}
-
 Name:		ghc
 Version:	6.4
 Release:	8
@@ -18,7 +15,7 @@
 URL:		http://haskell.org/ghc/
 Requires:	%{ghcver} = %{version}-%{release}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: sed, %{ghcver}, %{?_with_gcc32: compat-gcc-32}
+BuildRequires: sed, %{ghcver}
 Buildrequires: gmp-devel, readline-devel, xorg-x11-devel, freeglut-devel, openal-devel
 %if %{build_doc}
 # haddock generates libraries/ docs
@@ -100,7 +97,7 @@
 echo "GhcRTSWays=thr debug" >> mk/build.mk
 %endif
 
-./configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ghc=ghc-%{build_version} %{?_with_gcc32: --with-gcc=%{_bindir}/gcc32}
+./configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ghc=ghc-%{build_version}
 
 make all
 %if %{build_doc}
@@ -176,7 +173,6 @@
 
 * Thu May 12 2005 Jens Petersen <petersen at haskell.org>
 - add build_prof and build_doc switches for -doc and -prof subpackages
-- add _with_gcc32 switch since ghc-6.4 doesn't build with gcc-4.0
 
 * Wed May 11 2005 Jens Petersen <petersen at haskell.org> - 6.4-7
 - make package relocatable (ghc#1084122)




More information about the fedora-extras-commits mailing list