pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/bootstrap bootstrap: Invert the awk/sed test on Darwin.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/34a3a84c839e
branches:  trunk
changeset: 395268:34a3a84c839e
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Fri May 03 13:26:34 2019 +0000

description:
bootstrap: Invert the awk/sed test on Darwin.

This stops us having to continue to add new macOS releases, it appears
that Apple is not going to fix this issue any time soon.

diffstat:

 bootstrap/bootstrap |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (35 lines):

diff -r 258ebf3b77db -r 34a3a84c839e bootstrap/bootstrap
--- a/bootstrap/bootstrap       Fri May 03 11:52:31 2019 +0000
+++ b/bootstrap/bootstrap       Fri May 03 13:26:34 2019 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.263 2019/05/01 18:29:20 rillig Exp $
+# $NetBSD: bootstrap,v 1.264 2019/05/03 13:26:34 jperkin Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -581,8 +581,8 @@
 Darwin)
        root_group=wheel
        need_bsd_install=no
-       need_awk=no
-       need_sed=no
+       need_awk=yes
+       need_sed=yes
        set_opsys=no
        machine_arch=`get_machine_arch_darwin`
        CC=${CC:-"cc -isystem /usr/include"}; export CC
@@ -601,9 +601,9 @@
                ;;
        esac
        case "$macosx_version" in
-       10.[8-9]|10.1[0123])
-               need_awk=yes
-               need_sed=yes
+       10.[0-7])
+               need_awk=no
+               need_sed=no
                ;;
        esac
        unset osrev macosx_version



Home | Main Index | Thread Index | Old Index