Add the time library, and support for libraries in tarballs

4 files changed, 31 insertions, 3 deletions

diff --git a/boot b/boot
index 6f6b879234..43d2db5c0f 100644
--- a/boot
+++ b/boot
@@ -1,6 +1,9 @@
 #! /bin/sh
 set -e
 
+# Create libraries/*/{ghc.mk,GNUmakefile}
+sh boot-pkgs
+
 # Check that we have all boot packages.
 for dir in `grep "^[^# ][^ ]*  *[^ ][^ ]*  *[^ ][^ ]*$" packages | sed "s/ .*//"`
 do
@@ -30,6 +33,3 @@ do
         chmod +x $f
     fi
 done
-
-# Create libraries/*/{ghc.mk,GNUmakefile}
-sh boot-pkgs
diff --git a/boot-pkgs b/boot-pkgs
index 4892b52054..5bc6f6be61 100644
--- a/boot-pkgs
+++ b/boot-pkgs
@@ -3,6 +3,33 @@ set -e
 
 libraries=
 
+tarred="time"
+
+for p in $tarred
+do
+    libraries="$libraries libraries/$p"
+    if [ -d "libraries/$p/_darcs" ]
+    then
+        echo Ignoring libraries/$p as it looks like a darcs checkout
+    else
+        tarball=libraries/tarballs/$p-*.tar.gz
+        stamp="libraries/stamp/$p"
+        if [ ! -d "libraries/$p" ] ||
+           [ ! -f "$stamp" ] ||
+           [ "libraries/stamp/$p" -ot $tarball ]
+        then
+            rm -rf "libraries/$p"
+            mkdir "libraries/$p"
+            (
+                cd "libraries/$p"
+                tar -zxf ../../$tarball
+                mv */* .
+            )
+            touch "$stamp"
+        fi
+    fi
+done
+
 for f in libraries/*; do
   pkgs=$f/ghc-packages
   if test -f $pkgs; then
diff --git a/ghc.mk b/ghc.mk
index b6df093d33..81ec2f847d 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -302,6 +302,7 @@ endif
 PACKAGES += \
 	old-locale \
 	old-time \
+	time \
 	directory \
 	process \
 	random \
diff --git a/libraries/tarballs/time-1.1.4.tar.gz b/libraries/tarballs/time-1.1.4.tar.gz
new file mode 100644
index 0000000000..a365ffd027
--- /dev/null
+++ b/libraries/tarballs/time-1.1.4.tar.gz