diff options
| author | js <js@pkgsrc.org> | 2020-08-29 20:11:21 +0000 |
|---|---|---|
| committer | js <js@pkgsrc.org> | 2020-08-29 20:11:21 +0000 |
| commit | 62c00bb21a997fe12e8b04f00fe4a33e337e92b8 (patch) | |
| tree | 3ed46326403591c6747622968a3c040e773525ca | |
| parent | a8fc3f878c5be0d4474a4e30f37e552bf25a6a48 (diff) | |
| download | pkgsrc-62c00bb21a997fe12e8b04f00fe4a33e337e92b8.tar.gz | |
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?
| -rwxr-xr-x | bootstrap/bootstrap | 6 | ||||
| -rw-r--r-- | pkgtools/bootstrap-mk-files/files/mods/QNX.sys.mk | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index 464d4523130..9b45398aece 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -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> # 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 diff --git a/pkgtools/bootstrap-mk-files/files/mods/QNX.sys.mk b/pkgtools/bootstrap-mk-files/files/mods/QNX.sys.mk index 3727ec874dc..eba1bba484f 100644 --- a/pkgtools/bootstrap-mk-files/files/mods/QNX.sys.mk +++ b/pkgtools/bootstrap-mk-files/files/mods/QNX.sys.mk @@ -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?= |