CVS commit: pkgsrc

["Jonathan Schleifer" <js%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   js
Date:           Sat Aug 29 20:11:21 UTC 2020

Modified Files:
        pkgsrc/bootstrap: bootstrap
        pkgsrc/pkgtools/bootstrap-mk-files/files/mods: QNX.sys.mk

Log Message:
Fix bootstrap on QNX

Tested with QNX 6.5.0SP1.

Two things were needed:

 * bootstrap needs to export ACCEPT_INFERIOR_RM_PROGRAM=yes on QNX,
   because libarchive checks for "rm -f" (with no arguments) working in
   configure. It doesn't seem to actually use it during the build, so
   this works.
 * QNX.sys.mk sets LORDER to echo, but sets TSORT to tsort -q. This
   results in tsort complaining about having an uneven number of inputs,
   since of course there are no dependency pairs.
   Hence, if LORDER is overridden to echo, TSORT also needs to be
   overridden to cat. Interestingly, Linux.sys.mk also sets LORDER=echo
   and TSORT=tsort -q, so it's surprising this isn't broken as well?


To generate a diff of this commit:
cvs rdiff -u -r1.292 -r1.293 pkgsrc/bootstrap/bootstrap
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/pkgtools/bootstrap-mk-files/files/mods/QNX.sys.mk

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.292 pkgsrc/bootstrap/bootstrap:1.293
--- pkgsrc/bootstrap/bootstrap:1.292    Thu Aug 20 13:04:01 2020
+++ pkgsrc/bootstrap/bootstrap  Sat Aug 29 20:11:21 2020
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.292 2020/08/20 13:04:01 bacon Exp $
+# $NetBSD: bootstrap,v 1.293 2020/08/29 20:11:21 js Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -754,6 +754,10 @@ QNX)
        groupsprog="id -gn"
        whoamiprog="id -un"
        machine_arch=`uname -p | sed -e 's/x86/i386/'`
+       # libarchive checks for "rm -f" with no arguments being accepted. This
+       # does not work on QNX. Interestingly, libarchive doesn't seem to
+       # actually need it during the build.
+       export ACCEPT_INFERIOR_RM_PROGRAM=yes
        ;;
 SCO_SV)
        root_group=root

Index: pkgsrc/pkgtools/bootstrap-mk-files/files/mods/QNX.sys.mk
diff -u pkgsrc/pkgtools/bootstrap-mk-files/files/mods/QNX.sys.mk:1.2 pkgsrc/pkgtools/bootstrap-mk-files/files/mods/QNX.sys.mk:1.3
--- pkgsrc/pkgtools/bootstrap-mk-files/files/mods/QNX.sys.mk:1.2        Thu Sep  8 14:28:12 2016
+++ pkgsrc/pkgtools/bootstrap-mk-files/files/mods/QNX.sys.mk    Sat Aug 29 20:11:21 2020
@@ -1,4 +1,4 @@
-#      $NetBSD: QNX.sys.mk,v 1.2 2016/09/08 14:28:12 joerg Exp $
+#      $NetBSD: QNX.sys.mk,v 1.3 2020/08/29 20:11:21 js Exp $
 #      @(#)sys.mk      8.2 (Berkeley) 3/21/94
 
 unix?=         We run Unix
@@ -79,7 +79,7 @@ SHELL?=               sh
 
 SIZE?=         size
 
-TSORT?=        tsort -q
+TSORT?=        cat
 
 YACC?=         yacc
 YFLAGS?=