Have boot check that we have the dph packages when validating

diff --git a/boot b/boot
index 54209af..aa3b82d 100644 (file)
--- a/boot
+++ b/boot
@@ -4,6 +4,21 @@ use strict;
 
 use Cwd;
 
 
 use Cwd;
 

+my %required_tag;
+
+$required_tag{"-"} = 1;
+
+while ($#ARGV ne -1) {
+    my $arg = shift @ARGV;
+
+    if ($arg =~ /^--required-tag=(.*)/) {
+        $required_tag{$1} = 1;
+    }
+    else {
+        die "Bad arg: $arg";
+    }
+}
+

 # Create libraries/*/{ghc.mk,GNUmakefile}
 system("/usr/bin/perl", "-w", "boot-pkgs") == 0
     or die "Running boot-pkgs failed: $?";
 # Create libraries/*/{ghc.mk,GNUmakefile}
 system("/usr/bin/perl", "-w", "boot-pkgs") == 0
     or die "Running boot-pkgs failed: $?";

@@ -27,7 +42,7 @@ while (<PACKAGES>) {
         
         # If $tag is not "-" then it is an optional repository, so its
         # absence isn't an error.
         
         # If $tag is not "-" then it is an optional repository, so its
         # absence isn't an error.

-        if ($tag eq "-") {
+        if (defined($required_tag{$tag})) {

             # We would like to just check for an _darcs directory here,
             # but in an lndir tree we avoid making _darcs directories,
             # so it doesn't exist. We therefore require that every repo
             # We would like to just check for an _darcs directory here,
             # but in an lndir tree we avoid making _darcs directories,
             # so it doesn't exist. We therefore require that every repo

diff --git a/validate b/validate
index 4fd4495..c2954f2 100644 (file)
--- a/validate
+++ b/validate
@@ -73,7 +73,7 @@ if [ $no_clean -eq 0 ]; then
         INSTDIR=`cygpath -m "$INSTDIR"`
     fi
 
         INSTDIR=`cygpath -m "$INSTDIR"`
     fi
 

-    /usr/bin/perl -w boot
+    /usr/bin/perl -w boot --required-tag=dph

     ./configure --prefix="$INSTDIR" $config_args
 fi
 
     ./configure --prefix="$INSTDIR" $config_args
 fi