Tue Dec 28 10:13:01 2021 UTC ()
bootstrap: On SCO System V variants, we need either mksh or bash.

from Boyd Lynn Gerber.


(nia)
diff -r1.305 -r1.306 pkgsrc/bootstrap/bootstrap
cvs diff -r1.305 -r1.306 pkgsrc/bootstrap/bootstrap (expand / switch to unified diff)

--- pkgsrc/bootstrap/bootstrap 2021/12/27 14:16:30 1.305
+++ pkgsrc/bootstrap/bootstrap 2021/12/28 10:13:01 1.306
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#! /bin/sh 1#! /bin/sh
2 2
3# $NetBSD: bootstrap,v 1.305 2021/12/27 14:16:30 schmonz Exp $ 3# $NetBSD: bootstrap,v 1.306 2021/12/28 10:13:01 nia Exp $
4# 4#
5# Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org> 5# Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org>
6# All rights reserved. 6# All rights reserved.
7# 7#
8# Redistribution and use in source and binary forms, with or without 8# Redistribution and use in source and binary forms, with or without
9# modification, are permitted provided that the following conditions 9# modification, are permitted provided that the following conditions
10# are met: 10# are met:
11# 1. Redistributions of source code must retain the above copyright 11# 1. Redistributions of source code must retain the above copyright
12# notice, this list of conditions and the following disclaimer. 12# notice, this list of conditions and the following disclaimer.
13# 2. Redistributions in binary form must reproduce the above copyright 13# 2. Redistributions in binary form must reproduce the above copyright
14# notice, this list of conditions and the following disclaimer in the 14# notice, this list of conditions and the following disclaimer in the
15# documentation and/or other materials provided with the distribution. 15# documentation and/or other materials provided with the distribution.
16# 16#
@@ -789,26 +789,32 @@ QNX) @@ -789,26 +789,32 @@ QNX)
789 groupsprog="id -gn" 789 groupsprog="id -gn"
790 whoamiprog="id -un" 790 whoamiprog="id -un"
791 machine_arch=`uname -p | sed -e 's/x86/i386/'` 791 machine_arch=`uname -p | sed -e 's/x86/i386/'`
792 # libarchive checks for "rm -f" with no arguments being accepted. This 792 # libarchive checks for "rm -f" with no arguments being accepted. This
793 # does not work on QNX. Interestingly, libarchive doesn't seem to 793 # does not work on QNX. Interestingly, libarchive doesn't seem to
794 # actually need it during the build. 794 # actually need it during the build.
795 export ACCEPT_INFERIOR_RM_PROGRAM=yes 795 export ACCEPT_INFERIOR_RM_PROGRAM=yes
796 ;; 796 ;;
797SCO_SV) 797SCO_SV)
798 root_group=root 798 root_group=root
799 need_awk=yes 799 need_awk=yes
800 need_bsd_install=yes 800 need_bsd_install=yes
801 need_sed=yes 801 need_sed=yes
 802 if [ -x "/usr/bin/bash" ]; then
 803 bootstrap_sh=${SH:-/usr/bin/bash}
 804 bootstrap_sh_set=set
 805 else
 806 need_mksh=yes
 807 fi
802 whoamiprog='id -u' 808 whoamiprog='id -u'
803 groupsprog='id -g' 809 groupsprog='id -g'
804 # /bin/sh under OpenServer 5.0.7/3.2 breaks bmake tests. 810 # /bin/sh under OpenServer 5.0.7/3.2 breaks bmake tests.
805 #bmakexargs="$bmakexargs --with-defshell=/bin/ksh" 811 #bmakexargs="$bmakexargs --with-defshell=/bin/ksh"
806 ;; 812 ;;
807SunOS) 813SunOS)
808 root_group=root 814 root_group=root
809 need_bsd_install=yes 815 need_bsd_install=yes
810 use_bsdinstall=yes 816 use_bsdinstall=yes
811 if [ ! -x "/usr/gnu/bin/awk" ]; then 817 if [ ! -x "/usr/gnu/bin/awk" ]; then
812 need_awk=yes 818 need_awk=yes
813 fi 819 fi
814 if [ ! -x "/usr/gnu/bin/sed" ]; then 820 if [ ! -x "/usr/gnu/bin/sed" ]; then
@@ -823,26 +829,32 @@ SunOS) @@ -823,26 +829,32 @@ SunOS)
823 idprog="/usr/xpg4/bin/id" 829 idprog="/usr/xpg4/bin/id"
824 groupsprog="${idprog} -gn" 830 groupsprog="${idprog} -gn"
825 whoamiprog="${idprog} -un" 831 whoamiprog="${idprog} -un"
826 machine_arch=`isainfo -k` 832 machine_arch=`isainfo -k`
827 check_compiler=yes 833 check_compiler=yes
828 check_ssp=yes 834 check_ssp=yes
829 ;; 835 ;;
830UnixWare) 836UnixWare)
831 root_group=sys 837 root_group=sys
832 BSTRAP_ENV="INSTALL=/usr/ucb/install $BSTRAP_ENV" 838 BSTRAP_ENV="INSTALL=/usr/ucb/install $BSTRAP_ENV"
833 need_mkdir=yes 839 need_mkdir=yes
834 need_awk=yes 840 need_awk=yes
835 need_sed=yes 841 need_sed=yes
 842 if [ -x "/usr/bin/bash" ]; then
 843 bootstrap_sh=${SH:-/usr/bin/bash}
 844 bootstrap_sh_set=set
 845 else
 846 need_mksh=yes
 847 fi
836 whoamiprog=/usr/ucb/whoami 848 whoamiprog=/usr/ucb/whoami
837 machine_arch=`uname -m` 849 machine_arch=`uname -m`
838 CC="gcc -DUNIXWARE"; export CC 850 CC="gcc -DUNIXWARE"; export CC
839 ;; 851 ;;
840*) 852*)
841 echo "This platform ($opsys) is untried - good luck, and thanks for using pkgsrc" 853 echo "This platform ($opsys) is untried - good luck, and thanks for using pkgsrc"
842 root_group=wheel 854 root_group=wheel
843 need_bsd_install=yes 855 need_bsd_install=yes
844 need_awk=yes 856 need_awk=yes
845 need_sed=yes 857 need_sed=yes
846 ;; 858 ;;
847esac 859esac
848 860