diff options
| author | schmonz <schmonz@pkgsrc.org> | 2022-04-06 13:06:09 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2022-04-06 13:06:09 +0000 |
| commit | 3ee3ff08ede7f78c1f3b13d3b0e85fd78f1a989f (patch) | |
| tree | cb59055552ca06850d237418713d3bfffe6d2f9a /bootstrap | |
| parent | 43931e6b4809152d161cb9caeadd57d0d025cd2c (diff) | |
| download | pkgsrc-3ee3ff08ede7f78c1f3b13d3b0e85fd78f1a989f.tar.gz | |
README.macOS: nbsed requires no user action, merge comment to bootstrap.
Diffstat (limited to 'bootstrap')
| -rw-r--r-- | bootstrap/README.macOS | 8 | ||||
| -rwxr-xr-x | bootstrap/bootstrap | 5 |
2 files changed, 4 insertions, 9 deletions
diff --git a/bootstrap/README.macOS b/bootstrap/README.macOS index 6820af692f8..fd9a1877643 100644 --- a/bootstrap/README.macOS +++ b/bootstrap/README.macOS @@ -1,4 +1,4 @@ -$NetBSD: README.macOS,v 1.5 2021/02/10 17:30:20 gdt Exp $ +$NetBSD: README.macOS,v 1.6 2022/04/06 13:06:09 schmonz Exp $ This file describes the use of current versions of pkgsrc with multiple versions of Darwin and macOS, omitting information about @@ -109,12 +109,6 @@ option. Repeatable data about recovery is somewhat hard to obtain, as most are past this issue already and no longer interested in experimenting.) -** sed in 10.9 - -The sed that comes with 10.9 appears to be broken; it exits when -called on files with UTF-8 or other apparently-binary content. -Therefore, pkgsrc uses nbsed on 10.9. - * Developer tools and prerequisites ** XCode diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index ca7c5c7f7d0..6c0a75aa9ba 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.309 2022/04/03 20:46:11 tnn Exp $ +# $NetBSD: bootstrap,v 1.310 2022/04/06 13:06:09 schmonz Exp $ # # Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org> # All rights reserved. @@ -594,7 +594,8 @@ Darwin) macos_version=`sw_vers -productVersion | \ awk -F. '{ printf("%02d%02d", $1, $2) }'` - # Newer native sed does not support multibyte correctly. + # Since 10.9, native sed exits when called on files with UTF-8 + # or other apparently-binary content. if [ $macos_version -ge 1008 ]; then need_awk=yes need_sed=yes |