Received: by mail.netbsd.org (Postfix, from userid 605) id 94B3A84D79; Wed, 28 Apr 2021 11:14:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id CDC6D84D53 for ; Wed, 28 Apr 2021 11:14:51 +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 NfYBdTYIbsVd for ; Wed, 28 Apr 2021 11:14:51 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 4ECBF84CDF for ; Wed, 28 Apr 2021 11:14:51 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 48394FA95; Wed, 28 Apr 2021 11:14:51 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1619608491132820" MIME-Version: 1.0 Date: Wed, 28 Apr 2021 11:14:51 +0000 From: "Maya Rashish" Subject: CVS commit: pkgsrc/bootstrap To: pkgsrc-changes@NetBSD.org Reply-To: maya@netbsd.org X-Mailer: log_accum Message-Id: <20210428111451.48394FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1619608491132820 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: maya Date: Wed Apr 28 11:14:51 UTC 2021 Modified Files: pkgsrc/bootstrap: bootstrap Log Message: Don't reject dash as /bin/sh. From a discussion with jperkin, who tested this on bulk builds, the remaining issues with non-BSD echo are in legacy wrappers. Keep the workaround to use bash on Debian GNU kFreeBSD because it still uses legacy wrappers and add a comment that that's why it's there. Now naive usage of bootstrap on many popular Linux distros doesn't require setting an environment variable. To generate a diff of this commit: cvs rdiff -u -r1.298 -r1.299 pkgsrc/bootstrap/bootstrap Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1619608491132820 Content-Disposition: inline Content-Length: 1587 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/bootstrap/bootstrap diff -u pkgsrc/bootstrap/bootstrap:1.298 pkgsrc/bootstrap/bootstrap:1.299 --- pkgsrc/bootstrap/bootstrap:1.298 Mon Mar 15 16:22:06 2021 +++ pkgsrc/bootstrap/bootstrap Wed Apr 28 11:14:51 2021 @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.298 2021/03/15 16:22:06 ryoon Exp $ +# $NetBSD: bootstrap,v 1.299 2021/04/28 11:14:51 maya Exp $ # # Copyright (c) 2001-2011 Alistair Crooks # All rights reserved. @@ -399,19 +399,6 @@ case "$bootstrap_sh" in ;; esac -# On some newer Ubuntu installations, /bin/sh is a symlink to /bin/dash, -# whose echo(1) is not BSD-compatible. -# On all Debian GNU/kFreeBSD 7.0, /bin/sh is a symlink to /bin/dash, and -# use /bin/bash. bootstrap forces /bin/bash is used. -dash_echo_test=`$bootstrap_sh -c 'echo "\\100"'` -if [ "$opsys" != "GNUkFreeBSD" ] && [ "$dash_echo_test" = "@" ]; then - { echo "ERROR: Your shell's echo command is not BSD-compatible." - echo "ERROR: Please select another shell by setting the environment" - echo "ERROR: variable SH." - } 1>&2 - exit 1; -fi - if [ -n "$PKG_PATH" ]; then die "ERROR: Please unset PKG_PATH before running bootstrap." fi @@ -1149,6 +1136,7 @@ esac # On all Debian GNU/kFreeBSD 7, /bin/sh is a symlink to /bin/dash, and # use /bin/bash. +# Only needed by legacy wrappers. if [ "$opsys" = "GNUkFreeBSD" -a "$bootstrap_sh_set" != "set" ]; then echo "TOOLS_PLATFORM.sh?= /bin/bash # instead of /bin/sh" >> ${TARGET_MKCONF} echo "TOOLS_PLATFORM.sh?= /bin/bash # instead of /bin/sh" >> ${BOOTSTRAP_MKCONF} --_----------=_1619608491132820--