[commit: ghc] master: Random is now only needed to build dph (b343b65)

Simon Marlow marlowsd at gmail.com
Tue Jul 12 09:59:36 CEST 2011


On 08/07/2011 14:24, Ian Lynagh wrote:
> Repository : ssh://darcs.haskell.org//srv/darcs/ghc
>
> On branch  : master
>
> http://hackage.haskell.org/trac/ghc/changeset/b343b651602cb32c38ebe43b276e116b897ab2e7
>
>> ---------------------------------------------------------------
>
> commit b343b651602cb32c38ebe43b276e116b897ab2e7
> Author: Ian Lynagh<igloo at earth.li>
> Date:   Wed Jul 6 20:30:58 2011 +0100
>
>      Random is now only needed to build dph

So are we not shipping random any more?

I see you added reqlib('random') to the tests that depend on random, but 
that's bad because it means these tests are not being run by our nightly 
builds (which typically don't have dph).

Cheers,
	Simon




>> ---------------------------------------------------------------
>
>   ghc.mk   |    5 ++---
>   packages |    2 +-
>   2 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/ghc.mk b/ghc.mk
> index bd3d5da..27c7886 100644
> --- a/ghc.mk
> +++ b/ghc.mk
> @@ -297,12 +297,12 @@ INTREE_ONLY_PACKAGES := haskeline mtl terminfo utf8-string xhtml
>
>   DPH_PACKAGES := dph/dph-base dph/dph-prim-interface dph/dph-prim-seq \
>                   dph/dph-common dph/dph-prim-par dph/dph-par dph/dph-seq \
> -                vector primitive
> +                vector primitive random
>
>   # Packages that, if present, must be built by the stage2 compiler,
>   # because they use TH and/or annotations, or depend on other stage2
>   # packages:
> -STAGE2_PACKAGES := $(DPH_PACKAGES) haskell98 haskell2010 random
> +STAGE2_PACKAGES := $(DPH_PACKAGES) haskell98 haskell2010
>   # Packages that we shouldn't build if we don't have TH (e.g. because
>   # we're building a profiled compiler):
>   TH_PACKAGES := $(DPH_PACKAGES)
> @@ -386,7 +386,6 @@ $(eval $(call addPackage,old-time))
>   $(eval $(call addPackage,time))
>   $(eval $(call addPackage,directory))
>   $(eval $(call addPackage,process))
> -$(eval $(call addPackage,random))
>   $(eval $(call addPackage,extensible-exceptions))
>   $(eval $(call addPackage,haskell98))
>   $(eval $(call addPackage,haskell2010))
> diff --git a/packages b/packages
> index 743150e..84ce2b6 100644
> --- a/packages
> +++ b/packages
> @@ -64,7 +64,6 @@ libraries/old-locale            -           packages/old-locale.git
>   libraries/old-time              -           packages/old-time.git               git
>   libraries/pretty                -           packages/pretty.git                 git
>   libraries/process               -           packages/process.git                git
> -libraries/random                -           packages/random.git                 git
>   libraries/template-haskell      -           packages/template-haskell.git       git
>   libraries/terminfo              -           packages/terminfo.git               git
>   libraries/unix                  -           packages/unix.git                   git
> @@ -76,6 +75,7 @@ nofib                           nofib       nofib.git
>   libraries/deepseq               extra       packages/deepseq.git                git
>   libraries/parallel              extra       packages/parallel.git               git
>   libraries/stm                   extra       packages/stm.git                    git
> +libraries/random                dph         packages/random.git                 git
>   libraries/primitive             dph         packages/primitive.git              git
>   libraries/vector                dph         packages/vector.git                 git
>   libraries/dph                   dph         packages/dph.git                    git
>
>
>
> _______________________________________________
> Cvs-ghc mailing list
> Cvs-ghc at haskell.org
> http://www.haskell.org/mailman/listinfo/cvs-ghc




More information about the Cvs-ghc mailing list