CVS commit: pkgsrc/bootstrap

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Oct 22 19:29:20 UTC 2017

Modified Files:
        pkgsrc/bootstrap: bootstrap

Log Message:
Set cwrappers in bootstrap mk.conf too.

When bootstrap is run with --cwrappers=no (or yes, for that matter),
the value is written into mk.conf at the end of the bootstrap but not
used _during_ the bootstrap itself. Thus, when bootstrapping on Linux
with no builtin diffutils, cwrappers ends up indirectly depending on
itself, and there is no way around that. This commit fixes this.


To generate a diff of this commit:
cvs rdiff -u -r1.243 -r1.244 pkgsrc/bootstrap/bootstrap

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/bootstrap/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.243 pkgsrc/bootstrap/bootstrap:1.244
--- pkgsrc/bootstrap/bootstrap:1.243    Sat Sep 23 05:43:51 2017
+++ pkgsrc/bootstrap/bootstrap  Sun Oct 22 19:29:20 2017
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.243 2017/09/23 05:43:51 maya Exp $
+# $NetBSD: bootstrap,v 1.244 2017/10/22 19:29:20 bsiegert Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -1090,6 +1090,7 @@ cp ${TARGET_MKCONF} ${BOOTSTRAP_MKCONF}
 case "$cwrappers" in
 yes|no)
        echo "USE_CWRAPPERS=            $cwrappers" >> ${TARGET_MKCONF}
+       echo "USE_CWRAPPERS=            $cwrappers" >> ${BOOTSTRAP_MKCONF}
        echo "" >> ${TARGET_MKCONF}
        ;;
 esac