Received: by mail.netbsd.org (Postfix, from userid 605) id E6AB984CF0; Tue, 31 Oct 2017 15:53:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 6B44F855D1 for ; Tue, 31 Oct 2017 15:53:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 1RircBOhKWSB for ; Tue, 31 Oct 2017 15:53:49 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id EEBD4855D2 for ; Tue, 31 Oct 2017 15:53:48 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id EC604FBDE; Tue, 31 Oct 2017 15:53:48 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_150946522875510" MIME-Version: 1.0 Date: Tue, 31 Oct 2017 15:53:48 +0000 From: "S.P.Zeidler" Subject: CVS commit: [pkgsrc-2017Q3] pkgsrc/bootstrap To: pkgsrc-changes@NetBSD.org Reply-To: spz@netbsd.org X-Mailer: log_accum Message-Id: <20171031155348.EC604FBDE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_150946522875510 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: spz Date: Tue Oct 31 15:53:48 UTC 2017 Modified Files: pkgsrc/bootstrap [pkgsrc-2017Q3]: bootstrap Log Message: Pullup ticket #5599 - requested by sevan bootstrap/bootstrap: build fix Revisions pulled up: - bootstrap/bootstrap 1.244 ------------------------------------------------------------------- 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 To generate a diff of this commit: cvs rdiff -u -r1.243 -r1.243.4.1 pkgsrc/bootstrap/bootstrap Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_150946522875510 Content-Disposition: inline Content-Length: 739 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/bootstrap/bootstrap diff -u pkgsrc/bootstrap/bootstrap:1.243 pkgsrc/bootstrap/bootstrap:1.243.4.1 --- pkgsrc/bootstrap/bootstrap:1.243 Sat Sep 23 05:43:51 2017 +++ pkgsrc/bootstrap/bootstrap Tue Oct 31 15:53:48 2017 @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.243 2017/09/23 05:43:51 maya Exp $ +# $NetBSD: bootstrap,v 1.243.4.1 2017/10/31 15:53:48 spz Exp $ # # Copyright (c) 2001-2011 Alistair Crooks # 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 --_----------=_150946522875510--