packages: ghc/ghc.spec - old build changes

[glen]

Author: glen                         Date: Fri May  8 11:30:21 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- old build changes

---- Files affected:
packages/ghc:
   ghc.spec (1.83 -> 1.84) 

---- Diffs:

================================================================
Index: packages/ghc/ghc.spec
diff -u packages/ghc/ghc.spec:1.83 packages/ghc/ghc.spec:1.84
--- packages/ghc/ghc.spec:1.83	Thu Mar 19 11:32:28 2009
+++ packages/ghc/ghc.spec	Fri May  8 13:30:15 2009
@@ -1,4 +1,7 @@
 # $Revision$, $Date$
+# NOTE
+# - happy, alex needed only when using darcs checkout or regenerating parsers
+#   http://hackage.haskell.org/trac/ghc/wiki/Building/Prerequisites
 # TODO
 # - system gmp/gmp-4.2.1.tar.gz
 # - system libffi/libffi-3.0.4.tar.gz
@@ -28,6 +31,7 @@
 #template-haskell -any,
 #unix -any
 #make[2]: *** [boot.stage.2] Error 1
+# - http://hackage.haskell.org/trac/ghc/wiki/Building/Porting
 #
 # Conditional build:
 %bcond_with	bootstrap	# use foreign (non-rpm) ghc to bootstrap (extra 140MB to download)
@@ -54,6 +58,8 @@
 # NoSource4-md5:	efe7ce579a482b6bd87ed80ddf6e1f5c
 NoSource:	4
 %endif
+Patch0:	%{name}-system-libffi.patch
+Patch1:	%{name}-system-haddock.patch
 URL:		http://haskell.org/ghc/
 BuildRequires:	OpenAL-devel
 BuildRequires:	OpenGL-GLU-devel
@@ -61,7 +67,7 @@
 BuildRequires:	OpenGL-glut-devel
 %{!?with_bootstrap:BuildRequires:	alex >= 2.0}
 BuildRequires:	freealut-devel
-%{!?with_bootstrap:BuildRequires:	ghc}
+%{!?with_bootstrap:BuildRequires:	ghc >= 6.6}
 BuildRequires:	gmp-devel
 %{!?with_bootstrap:BuildRequires:	happy >= 1.15}
 BuildRequires:	ncurses-devel
@@ -152,6 +158,8 @@
 %endif
 mv %{name}-%{version} binsrc
 %endif
+%patch0 -p1
+%patch1 -p1
 
 # 0.10.1 ghc-pkg -l is not supported
 sed -i -e 's,fp_ghc_pkg_guess" -l,fp_ghc_pkg_guess" list,' configure
@@ -173,6 +181,7 @@
 
 %if %{with unregistered}
 cat << 'EOF' >> mk/build.mk
+# An unregisterised build is one that compiles via vanilla C only
 # http://hackage.haskell.org/trac/ghc/wiki/Building/Unregisterised
 GhcUnregisterised=YES
 GhcWithNativeCodeGen=NO
@@ -293,6 +302,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.84  2009/05/08 11:30:15  glen
+- old build changes
+
 Revision 1.83  2009/03/19 10:32:28  glen
 - some progress with bootstrap, but pkg check failures now
 - added extralibs bcond
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc/ghc.spec?r1=1.83&r2=1.84&f=u