st is now split off from base

diff --git a/compiler/ghc.cabal b/compiler/ghc.cabal
index 88b04d1..8d37b58 100644 (file)
--- a/compiler/ghc.cabal
+++ b/compiler/ghc.cabal
@@ -14,6 +14,9 @@ Category: XXX
 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.
 
@@ -35,16 +38,24 @@ Flag stage1
 Library
     Exposed: False
 
+    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: st         >= 0.1 && < 0.2
+
+    if flag(base3) || flag(base4)
+        Build-Depends: directory  >= 1   && < 1.1,
                        process    >= 1   && < 1.1,
                        bytestring >= 0.9 && < 0.10,
                        old-time   >= 1   && < 1.1,
                        containers >= 0.1 && < 0.2,
                        array      >= 0.1 && < 0.2
-    else
-        Build-Depends: base < 3
+
     Build-Depends: filepath >= 1 && < 1.2
     Build-Depends: haskell98, Cabal, hpc
     if os(windows)

diff --git a/ghc/ghc-bin.cabal b/ghc/ghc-bin.cabal
index 95059c7..ede227b 100644 (file)
--- a/ghc/ghc-bin.cabal
+++ b/ghc/ghc-bin.cabal
@@ -25,7 +25,7 @@ Flag ghci
 Executable ghc
     Main-Is: Main.hs
     if flag(base3)
-        Build-Depends: base       >= 3   && < 4,
+        Build-Depends: base       >= 3   && < 5,
                        directory  >= 1   && < 1.1
     else
         Build-Depends: base < 3

diff --git a/libraries/Makefile b/libraries/Makefile
index 2d68868..85c9b59 100644 (file)
--- 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 base3-compat array packedstring
+SUBDIRS  = ghc-prim $(INTEGER_LIBRARY) base st base3-compat array packedstring
 SUBDIRS += containers bytestring old-locale old-time filepath 
 ifeq "$(GhcLibsWithUnix)" "YES"
 SUBDIRS += unix

diff --git a/packages b/packages
index d27d17a..c5b166f 100644 (file)
--- a/packages
+++ b/packages
@@ -22,6 +22,7 @@ libraries/packedstring                  packages/packedstring           darcs
 libraries/pretty                        packages/pretty                 darcs
 libraries/process                       packages/process                darcs
 libraries/random                        packages/random                 darcs
+libraries/st                            packages/st                     darcs
 libraries/template-haskell              packages/template-haskell       darcs
 libraries/unix                          packages/unix                   darcs
 libraries/Win32                         packages/Win32                  darcs