diff options
| -rw-r--r-- | libraries/Makefile | 2 | ||||
| -rw-r--r-- | packages | 1 | ||||
| -rw-r--r-- | utils/ghc-pkg/ghc-pkg.cabal | 20 | ||||
| -rw-r--r-- | utils/hasktags/hasktags.cabal | 2 |
4 files changed, 19 insertions, 6 deletions
diff --git a/libraries/Makefile b/libraries/Makefile index 85c9b5955c..e78a5c815f 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 st base3-compat array packedstring +SUBDIRS = ghc-prim $(INTEGER_LIBRARY) base st getopt base3-compat array packedstring SUBDIRS += containers bytestring old-locale old-time filepath ifeq "$(GhcLibsWithUnix)" "YES" SUBDIRS += unix @@ -12,6 +12,7 @@ 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 diff --git a/utils/ghc-pkg/ghc-pkg.cabal b/utils/ghc-pkg/ghc-pkg.cabal index cefad041dd..1e862a7cd5 100644 --- a/utils/ghc-pkg/ghc-pkg.cabal +++ b/utils/ghc-pkg/ghc-pkg.cabal @@ -13,19 +13,31 @@ Category: Development build-type: Simple cabal-version: >=1.2 +Flag base4 + Description: Choose the even newer, even smaller, split-up base package. + Flag base3 Description: Choose the new smaller, split-up base package. Executable ghc-pkg Main-Is: Main.hs Extensions: CPP, ForeignFunctionInterface + + if flag(base4) + Build-Depends: base >= 4 && < 5 if flag(base3) - Build-Depends: base >= 3 && < 5, - directory >= 1 && < 1.1, + Build-Depends: base >= 3 && < 4 + 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, process >= 1 && < 1.1, pretty >= 1 && < 1.1 - else - Build-Depends: base < 3 + Build-Depends: haskell98, filepath, Cabal if !os(windows) Build-Depends: unix diff --git a/utils/hasktags/hasktags.cabal b/utils/hasktags/hasktags.cabal index 045256d534..e102b8b635 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 + Build-Depends: haskell98, base, getopt |