pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/bootstrap Set cwrappers in bootstrap mk.conf too.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/eee723524de1
branches:  trunk
changeset: 370659:eee723524de1
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sun Oct 22 19:29:20 2017 +0000

description:
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.

diffstat:

 bootstrap/bootstrap |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (19 lines):

diff -r cd618820ef33 -r eee723524de1 bootstrap/bootstrap
--- a/bootstrap/bootstrap       Sun Oct 22 18:43:48 2017 +0000
+++ b/bootstrap/bootstrap       Sun Oct 22 19:29:20 2017 +0000
@@ -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 @@
 case "$cwrappers" in
 yes|no)
        echo "USE_CWRAPPERS=            $cwrappers" >> ${TARGET_MKCONF}
+       echo "USE_CWRAPPERS=            $cwrappers" >> ${BOOTSTRAP_MKCONF}
        echo "" >> ${TARGET_MKCONF}
        ;;
 esac



Home | Main Index | Thread Index | Old Index