CVS commit: pkgsrc/bootstrap

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Tue Nov  5 13:58:06 UTC 2019

Modified Files:
        pkgsrc/bootstrap: bootstrap

Log Message:
boostrap: need_awk=yes for Arch Linux

Arch uses GNU Awk 5 that breaks some regexps.


To generate a diff of this commit:
cvs rdiff -u -r1.271 -r1.272 pkgsrc/bootstrap/bootstrap

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/bootstrap/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.271 pkgsrc/bootstrap/bootstrap:1.272
--- pkgsrc/bootstrap/bootstrap:1.271    Fri Sep 13 20:10:35 2019
+++ pkgsrc/bootstrap/bootstrap  Tue Nov  5 13:58:06 2019
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.271 2019/09/13 20:10:35 rillig Exp $
+# $NetBSD: bootstrap,v 1.272 2019/11/05 13:58:06 triaxx Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -747,6 +747,11 @@ Linux)
        # some regexp used in pkgsrc/mk.
        if [ -f /etc/debian_version ]; then
                need_awk=yes
+       # Arch uses gawk 5 that breaks some regexps. It doesn't provide pax
+       # anymore.
+       elif [ -f /etc/arch-release ]; then
+               need_awk=yes
+               need_pax=yes
        elif grep -sq '^CHROMEOS_RELEASE_NAME' /etc/lsb-release; then
                need_awk=yes
                need_sed=yes
@@ -754,10 +759,6 @@ Linux)
                need_awk=no
                need_sed=no
        fi
-  # Arch does not provide pax anymore
-       if [ -f /etc/arch-release ]; then
-               need_pax=yes
-       fi
        set_opsys=no
        machine_arch=`uname -m`
        # Override machine_arch where required.