Re: Bootstrap pkgsrc cvs from 05 November 2021 UnixWare 7 Resolved

[nia <nia%NetBSD.org@localhost>]

On Fri, Nov 12, 2021 at 11:40:49AM -0700, Boyd Lynn Gerber wrote:
> Hello
> 
> The attached patch resolves the issue and gives me
> 
> i386-unknown-sysv5UnixWare7.1.4
> 
> Thanks for the assistance

To pick the machine architecture, I've modified
the boostrap script. uname -m should return i386, correct?

Index: mk/bsd.prefs.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/bsd.prefs.mk,v
retrieving revision 1.410
diff -u -p -u -r1.410 bsd.prefs.mk
--- mk/bsd.prefs.mk	2 Nov 2021 08:14:58 -0000	1.410
+++ mk/bsd.prefs.mk	12 Nov 2021 20:27:14 -0000
@@ -285,6 +285,12 @@ OS_VARIANT=		SCOOSR5
 OS_VARIANT=		SCOOSR6
 .  endif
 
+.elif ${OPSYS} == "UnixWare"
+SCO_RELEASE?=		sysv5${OPSYS}
+SCO_VERSION!=		${UNAME} -v
+LOWER_VENDOR?=		unknown
+LOWER_OPSYS_VERSUFFIX=	${SCO_RELEASE}${SCO_VERSION}
+
 .elif ${OPSYS} == "Minix"
 LOWER_VENDOR?=		unknown
 LOWER_OPSYS:=		${OPSYS:tl}
@@ -362,6 +368,8 @@ OBJECT_FMT=	SOM
 OBJECT_FMT=	PE
 .elif ${OPSYS} == "SCO_SV"
 OBJECT_FMT=	ELF
+.elif ${OPSYS} == "UnixWare"
+OBJECT_FMT=	ELF
 .endif
 
 # Calculate depth
Index: bootstrap/bootstrap
===================================================================
RCS file: /cvsroot/pkgsrc/bootstrap/bootstrap,v
retrieving revision 1.302
diff -u -p -u -r1.302 bootstrap
--- bootstrap/bootstrap	13 Jul 2021 12:43:58 -0000	1.302
+++ bootstrap/bootstrap	12 Nov 2021 20:27:14 -0000
@@ -835,6 +835,7 @@ UnixWare)
 	need_awk=yes
 	need_sed=yes
 	whoamiprog=/usr/ucb/whoami
+	machine_arch=`uname -m`
 	CC="gcc -DUNIXWARE"; export CC
 	;;
 *)