diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2019-07-23 11:26:32 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2019-07-23 11:26:32 +0000 |
| commit | 89236d27f840067297b52523b138d967060b7be1 (patch) | |
| tree | 68e7178d1433dc461f59327389a121856f2d13c3 | |
| parent | 7875b718b5f5b54da48e0f4d02a8eba685d57b64 (diff) | |
| download | pkgsrc-89236d27f840067297b52523b138d967060b7be1.tar.gz | |
Pullup ticket #6010 - requested by rillig
bootstrap: Solaris 10 build fix (PR pkg/54349)
Revisions pulled up:
- bootstrap/bootstrap 1.269
---
Module Name: pkgsrc
Committed By: rillig
Date: Sun Jul 21 20:14:06 UTC 2019
Modified Files:
pkgsrc/bootstrap: bootstrap
Log Message:
bootstrap/bootstrap: fix bootstrap on Solaris 10
Fixes pkg/54349.
| -rwxr-xr-x | bootstrap/bootstrap | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index d7f86b32ebd..3098be25b5b 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.266.2.1 2019/07/06 16:23:36 bsiegert Exp $ +# $NetBSD: bootstrap,v 1.266.2.2 2019/07/23 11:26:32 bsiegert Exp $ # # Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org> # All rights reserved. @@ -31,8 +31,13 @@ # compiler/linker flags: CFLAGS, CPPFLAGS, LDFLAGS, LIBS # tools: CP, GREP, ID, MKDIR, SH, TEST, TOUCH, XARGS +# The bootstrap program must be able to run with very limited shells. +# It must not use any of the following features: +# +# * the ${var%pattern} or ${var#pattern} expansions +# * the $(command) subshell -BOOTSTRAP_VERSION=20060721 +BOOTSTRAP_VERSION=20190721 # Don't let the bootstrap program get confused by a pre-existing mk.conf # file. @@ -363,7 +368,7 @@ checkarg_no_symlink_path() { _dir=$1 while [ ! -d "$_dir" ]; do - _dir=${_dir%/*} + _dir=`dirname "$_dir"` [ "$_dir" ] || _dir="/" done |