[pkgsrc/trunk]: pkgsrc/bootstrap Added a fix for the case when /bin/sh is a (...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d169e5c91760
branches:  trunk
changeset: 524521:d169e5c91760
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Jan 26 15:48:42 2007 +0000

description:
Added a fix for the case when /bin/sh is a (symlink to) dash.

diffstat:

 bootstrap/bootstrap |  9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diffs (25 lines):

diff -r d97eccf68e48 -r d169e5c91760 bootstrap/bootstrap
--- a/bootstrap/bootstrap       Fri Jan 26 15:16:26 2007 +0000
+++ b/bootstrap/bootstrap       Fri Jan 26 15:48:42 2007 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.89 2007/01/26 07:57:04 rillig Exp $
+# $NetBSD: bootstrap,v 1.90 2007/01/26 15:48:42 rillig Exp $
 #
 #
 # Copyright (c) 2001-2002 Alistair G. Crooks.  All rights reserved.
@@ -853,6 +853,13 @@
 copy_src $pkgsrcdir/pkgtools/pkg_install/files pkg_install
 run_cmd "(cd $wrkdir/pkg_install; env $BSTRAP_ENV CPPFLAGS='$CPPFLAGS -I../libnbcompat -I../../libnbcompat' LDFLAGS='$LDFLAGS -L../libnbcompat -L../../libnbcompat' LIBS='-lnbcompat' $shprog 
./configure $configure_quiet_flags -C --prefix=$prefix --sysconfdir=$sysconfdir --with-pkgdbdir=$pkgdbdir --mandir=$mandir $pkg_install_args && $bmake && $bmake install)"
 
+# On some newer Ubuntu installations, /bin/sh is a symlink to /bin/dash,
+# whose echo(1) is not POSIX-compliant.
+dash_echo_test=`echo "\\100"`
+if [ "$dash_echo_test" = "@" ]; then
+       echo "TOOLS_PLATFORM.sh?=               /bin/bash       # instead of /bin/sh" >> ${MKCONF_EXAMPLE}
+fi
+
 # preserve compiler and tool environment variables settings
 test -z "$CP" || echo "TOOLS_PLATFORM.cp?=             $CP" >> ${MKCONF_EXAMPLE}
 test -z "$GREP" || echo "TOOLS_PLATFORM.grep?=         $GREP" >> ${MKCONF_EXAMPLE}