pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/bootstrap boostrap: need_awk=yes for Arch Linux



details:   https://anonhg.NetBSD.org/pkgsrc/rev/37312ae48ff7
branches:  trunk
changeset: 417174:37312ae48ff7
user:      triaxx <triaxx%pkgsrc.org@localhost>
date:      Tue Nov 05 13:58:06 2019 +0000

description:
boostrap: need_awk=yes for Arch Linux

Arch uses GNU Awk 5 that breaks some regexps.

diffstat:

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

diffs (34 lines):

diff -r 623a6dd308c1 -r 37312ae48ff7 bootstrap/bootstrap
--- a/bootstrap/bootstrap       Tue Nov 05 09:15:20 2019 +0000
+++ b/bootstrap/bootstrap       Tue Nov 05 13:58:06 2019 +0000
@@ -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 @@
        # 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 @@
                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.



Home | Main Index | Thread Index | Old Index