diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-09-03 22:35:08 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-09-03 22:35:08 +0000 |
| commit | 71cb36e103ce6892256c2e9c712e78ea37e7dff1 (patch) | |
| tree | ce89e10ab73a9a89aaf916202fa88d8bfe55c25b | |
| parent | 3a006cb547b5e0fafe2add853209519e6d4a1ccc (diff) | |
| download | haskell-71cb36e103ce6892256c2e9c712e78ea37e7dff1.tar.gz | |
Re-merge concurrent,timeout,unique,st,getopt into base
| -rw-r--r-- | compiler/ghc.cabal | 4 | ||||
| -rw-r--r-- | libraries/Makefile | 2 | ||||
| -rw-r--r-- | packages | 5 | ||||
| -rw-r--r-- | utils/ghc-pkg/ghc-pkg.cabal | 4 | ||||
| -rw-r--r-- | utils/hasktags/hasktags.cabal | 2 | ||||
| -rw-r--r-- | utils/hpc/hpc-bin.cabal | 2 |
6 files changed, 2 insertions, 17 deletions
diff --git a/compiler/ghc.cabal b/compiler/ghc.cabal index a08f518037..eff7bd3792 100644 --- a/compiler/ghc.cabal +++ b/compiler/ghc.cabal @@ -53,10 +53,6 @@ Library if !flag(base3) && !flag(base4) Build-Depends: base < 3 - if flag(base4) - Build-Depends: concurrent >= 0.1 && < 0.2, - st >= 0.1 && < 0.2 - if flag(base3) || flag(base4) Build-Depends: directory >= 1 && < 1.1, process >= 1 && < 1.1, diff --git a/libraries/Makefile b/libraries/Makefile index 4249ceec49..1a52cbbe1d 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -41,7 +41,7 @@ include $(TOP)/mk/cabal-flags.mk # Any libraries listed here should also be in ../packages -SUBDIRS = ghc-prim $(INTEGER_LIBRARY) base syb concurrent unique timeout st getopt base3-compat array packedstring +SUBDIRS = ghc-prim $(INTEGER_LIBRARY) base syb base3-compat array packedstring SUBDIRS += containers bytestring old-locale old-time filepath ifeq "$(GhcLibsWithUnix)" "YES" SUBDIRS += unix @@ -9,12 +9,10 @@ libraries/base packages/base darcs libraries/base3-compat packages/base3-compat darcs libraries/bytestring packages/bytestring darcs libraries/Cabal packages/Cabal darcs -libraries/concurrent packages/concurrent darcs libraries/containers packages/containers darcs libraries/directory packages/directory darcs libraries/editline packages/editline darcs libraries/filepath packages/filepath darcs -libraries/getopt packages/getopt darcs libraries/ghc-prim packages/ghc-prim darcs libraries/haskell98 packages/haskell98 darcs libraries/hpc packages/hpc darcs @@ -26,10 +24,7 @@ libraries/pretty packages/pretty darcs libraries/process packages/process darcs libraries/random packages/random darcs libraries/syb packages/syb darcs -libraries/st packages/st darcs libraries/template-haskell packages/template-haskell darcs -libraries/timeout packages/timeout darcs -libraries/unique packages/unique darcs libraries/unix packages/unix darcs libraries/Win32 packages/Win32 darcs libraries/HUnit extralibs packages/HUnit darcs diff --git a/utils/ghc-pkg/ghc-pkg.cabal b/utils/ghc-pkg/ghc-pkg.cabal index 0ab3534179..a201cb8816 100644 --- a/utils/ghc-pkg/ghc-pkg.cabal +++ b/utils/ghc-pkg/ghc-pkg.cabal @@ -30,10 +30,6 @@ Executable ghc-pkg if !flag(base3) && !flag(base4) Build-Depends: base < 3 - if flag(base4) - Build-Depends: concurrent >= 0.1 && < 0.2, - getopt >= 0.1 && < 0.2 - if flag(base3) || flag(base4) Build-Depends: directory >= 1 && < 1.1, process >= 1 && < 1.1, diff --git a/utils/hasktags/hasktags.cabal b/utils/hasktags/hasktags.cabal index e102b8b635..045256d534 100644 --- a/utils/hasktags/hasktags.cabal +++ b/utils/hasktags/hasktags.cabal @@ -15,5 +15,5 @@ cabal-version: >=1.2 Executable hasktags Main-Is: HaskTags.hs - Build-Depends: haskell98, base, getopt + Build-Depends: haskell98, base diff --git a/utils/hpc/hpc-bin.cabal b/utils/hpc/hpc-bin.cabal index 2c1cd97fb5..893af9ef7f 100644 --- a/utils/hpc/hpc-bin.cabal +++ b/utils/hpc/hpc-bin.cabal @@ -30,8 +30,6 @@ Executable hpc if !flag(base3) && !flag(base4) Build-Depends: base < 3 - if flag(base4) - Build-Depends: getopt >= 0.1 && < 0.2 if flag(base3) || flag(base4) Build-Depends: directory >= 1 && < 1.1, containers >= 0.1 && < 0.2, |