SPECS: ghc.spec - update build to new way

arekm arekm at pld-linux.org
Sat Jan 20 23:25:27 CET 2007


Author: arekm                        Date: Sat Jan 20 22:25:27 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- update build to new way

---- Files affected:
SPECS:
   ghc.spec (1.58 -> 1.59) 

---- Diffs:

================================================================
Index: SPECS/ghc.spec
diff -u SPECS/ghc.spec:1.58 SPECS/ghc.spec:1.59
--- SPECS/ghc.spec:1.58	Sat Jan 20 21:57:15 2007
+++ SPECS/ghc.spec	Sat Jan 20 23:25:22 2007
@@ -13,6 +13,7 @@
 Source0:	http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.bz2
 # Source0-md5:	2427a8d7d14f86e0878df6b54938acf7
 Patch0:		%{name}-ac.patch
+Patch1:		%{name}-tinfo.patch
 URL:		http://haskell.org/ghc/
 BuildRequires:	alex >= 2.0
 BuildRequires:	autoconf
@@ -84,36 +85,20 @@
 %prep
 %setup -q
 %patch0 -p1
-
-# generate our own `build.mk'
-#
-# * this is a kludge
-#
-cat >mk/build.mk <<END
-GhcLibWays = p
-SRC_HAPPY_OPTS += -agc # useful from Happy 1.7 onwards
-SRC_HAPPY_OPTS += -c
-END
-%ifarch %{x8664} alpha sparc
-cat >>mk/build.mk <<END 
-GhcUnregisterised=YES
-END
-%endif
-%ifarch %{x8664} alpha ppc sparc
-cat >>mk/build.mk <<END 
-SplitObjs=NO
-END
-%endif
+%patch1 -p1
 
 %build
+cd libraries/readline/
+%{__autoconf}
+cd ../..
+
 cp -f /usr/share/automake/config.sub .
 %{__autoconf}
 %configure \
 	--with-gcc="%{__cc}" \
 	--disable-openal
 
-%{__make} boot
-%{__make} all
+%{__make}
 %{__make} -C docs html
 %{__make} -C ghc/docs html
 %{__make} -C hslibs/doc html
@@ -176,6 +161,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.59  2007/01/20 22:25:22  arekm
+- update build to new way
+
 Revision 1.58  2007/01/20 20:57:15  qboosh
 - added missing update information to last changelog entry
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ghc.spec?r1=1.58&r2=1.59&f=u



More information about the pld-cvs-commit mailing list