diff options
| author | jperkin <jperkin@pkgsrc.org> | 2020-06-29 12:38:03 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2020-06-29 12:38:03 +0000 |
| commit | a790c0e17bb5d0e9d58489ad59d67fcd71003702 (patch) | |
| tree | 6436a16da3acc294ff35b434e882adeaed578111 /bootstrap/bootstrap | |
| parent | 19d800ee778460d60c077bcfcf75e1b3a16fb6a8 (diff) | |
| download | pkgsrc-a790c0e17bb5d0e9d58489ad59d67fcd71003702.tar.gz | |
bootstrap: Overhaul Darwin version selection.
With the upcoming Big Sur release we can't assume that the major version will
always be 10. Creating a combined major and minor version number also allows
us to simplify and future-proof some tests.
Should be no functional change.
Diffstat (limited to 'bootstrap/bootstrap')
| -rwxr-xr-x | bootstrap/bootstrap | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index 2953cefe4e4..e6d78ef3efc 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.282 2020/06/29 12:01:38 jperkin Exp $ +# $NetBSD: bootstrap,v 1.283 2020/06/29 12:38:03 jperkin Exp $ # # Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org> # All rights reserved. @@ -573,34 +573,35 @@ CYGWIN_*) whoamiprog='id -u' groupsprog='id -g' ;; - Darwin) root_group=wheel - need_awk=yes - need_sed=yes machine_arch=`get_machine_arch_darwin` CC=${CC:-"cc -isystem /usr/include"}; export CC check_compiler=yes osrev=`uname -r` - macosx_version=`echo $osrev | awk -F . '{ print "10."$1-4; }'` - case "$macosx_version" in - 10.[7-9]) + + # Combine major.minor product version for simpler numerical tests. + macos_version=`sw_vers -productVersion | awk -F. '{print $1 $2}'` + + # Newer native sed does not support multibyte correctly. + if [ $macos_version -ge 1008 ]; then + need_awk=yes + need_sed=yes + fi + + case "$macos_version" in + 100[7-9]) packagemaker=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker ;; - 10.[0-4]) + 100[0-4]) packagemaker=/Developer/Tools/packagemaker ;; *) packagemaker=/Developer/usr/bin/packagemaker ;; esac - case "$macosx_version" in - 10.[0-7]) - need_awk=no - need_sed=no - ;; - esac - unset osrev macosx_version + + unset osrev macos_version ;; DragonFly) root_group=wheel |