packages: ghc/ghc.spec - restored build options

baggins baggins at pld-linux.org
Thu Apr 8 14:52:57 CEST 2010


Author: baggins                      Date: Thu Apr  8 12:52:57 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- restored build options

---- Files affected:
packages/ghc:
   ghc.spec (1.101 -> 1.102) 

---- Diffs:

================================================================
Index: packages/ghc/ghc.spec
diff -u packages/ghc/ghc.spec:1.101 packages/ghc/ghc.spec:1.102
--- packages/ghc/ghc.spec:1.101	Wed Apr  7 17:16:06 2010
+++ packages/ghc/ghc.spec	Thu Apr  8 14:52:51 2010
@@ -131,28 +131,21 @@
 
 %build
 cat <<'EOF' > mk/build.mk
-# http://darcs.haskell.org/ghc/mk/build.mk.sample
-#SRC_HC_OPTS	 = -O2 -H64m -fasm
-#GhcStage1HcOpts = -O0 -fasm -Wall
-#GhcStage2HcOpts = -O0 -fasm -Wall
-#GhcHcOpts	   = -Rghc-timing
-#GhcLibHcOpts	= -O2 -XGenerics
-#GhcLibWays	  = p
-#SplitObjs	   = YES
-#SplitObjs	   = No
-#GhcBootLibs	 = %{!?with_extralibs:NO}%{?with_extralibs:YES}
-#%{!?with_doc:HADDOCK_DOCS = NO}
+#GhcStage1HcOpts += -O0 -Wall
+#GhcStage2HcOpts += -O0 -Wall
+SRC_HC_OPTS      += -lffi -O0 -H64m
+GhcHcOpts        += -Rghc-timing
+#GhcLibHcOpts     += -O -dcore-lint -keep-hc-files
+SplitObjs        += NO
+#GhcBootLibs	  += %{!?with_extralibs:NO}%{?with_extralibs:YES}
+HADDOCK_DOCS     += %{!?with_doc:NO}%{?with_doc:YES}
+XSLTPROC_OPTS    += --nonet
 EOF
 
 %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
-GhcWithInterpreter=NO
-SplitObjs=NO
-EOF
+echo GhcUnregisterised=YES >>mk/build.mk
 %endif
 
 top=$(pwd)
@@ -862,6 +855,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.102  2010/04/08 12:52:51  baggins
+- restored build options
+
 Revision 1.101  2010/04/07 15:16:06  baggins
 - rel 5
 
================================================================

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



More information about the pld-cvs-commit mailing list