Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_167728960260190"
MIME-Version: 1.0
Date: Sat, 25 Feb 2023 01:46:42 +0000
From: "Taylor R Campbell" <riastradh@netbsd.org>
Subject: CVS commit: pkgsrc/pkgtools/bootstrap-mk-files
To: pkgsrc-changes@NetBSD.org
Reply-To: riastradh@netbsd.org
Message-Id: <20230225014642.EFB41FA90@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_167728960260190
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	riastradh
Date:		Sat Feb 25 01:46:42 UTC 2023

Modified Files:
	pkgsrc/pkgtools/bootstrap-mk-files: Makefile
	pkgsrc/pkgtools/bootstrap-mk-files/files/mods: bsd.own.mk.in

Log Message:
bootstrap-mk-files: Set OBJECT_FMT=ELF in bsd.own.mk.

mips64eb is not on a.out, but the outdated bsd.own.mk conditionals
selected that for it.  This now matches modern NetBSD, as of 2008 --
everything's on ELF, nothing on a.out or COFF any more.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/pkgtools/bootstrap-mk-files/Makefile
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/pkgtools/bootstrap-mk-files/files/mods/bsd.own.mk.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_167728960260190
Content-Disposition: inline
Content-Length: 2459
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/pkgtools/bootstrap-mk-files/Makefile
diff -u pkgsrc/pkgtools/bootstrap-mk-files/Makefile:1.56 pkgsrc/pkgtools/bootstrap-mk-files/Makefile:1.57
--- pkgsrc/pkgtools/bootstrap-mk-files/Makefile:1.56	Sun Jan 26 17:31:59 2020
+++ pkgsrc/pkgtools/bootstrap-mk-files/Makefile	Sat Feb 25 01:46:42 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2020/01/26 17:31:59 rillig Exp $
+# $NetBSD: Makefile,v 1.57 2023/02/25 01:46:42 riastradh Exp $
 
-PKGNAME=	bootstrap-mk-files-20180901
+PKGNAME=	bootstrap-mk-files-20230224
 CATEGORIES=	pkgtools
 
 CONFLICTS+=	mk-files-[0-9]*

Index: pkgsrc/pkgtools/bootstrap-mk-files/files/mods/bsd.own.mk.in
diff -u pkgsrc/pkgtools/bootstrap-mk-files/files/mods/bsd.own.mk.in:1.6 pkgsrc/pkgtools/bootstrap-mk-files/files/mods/bsd.own.mk.in:1.7
--- pkgsrc/pkgtools/bootstrap-mk-files/files/mods/bsd.own.mk.in:1.6	Sat Sep  1 21:56:04 2018
+++ pkgsrc/pkgtools/bootstrap-mk-files/files/mods/bsd.own.mk.in	Sat Feb 25 01:46:42 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk.in,v 1.6 2018/09/01 21:56:04 tnn Exp $
+#	$NetBSD: bsd.own.mk.in,v 1.7 2023/02/25 01:46:42 riastradh Exp $
 
 .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1
@@ -103,33 +103,16 @@ NOPROFILE=1
 NOPIC?=1
 .endif
 
-# Data-driven table using make variables to control how 
+#
+# Data-driven table using make variables to control how
 # toolchain-dependent targets and shared libraries are built
 # for different platforms and object formats.
+#
 # OBJECT_FMT:		currently either "ELF" or "a.out".
-# SHLIB_TYPE:		"ELF" or "a.out" or "" to force static libraries.
 #
-.if ${MACHINE_ARCH} == "alpha" || \
-    ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
-    ${MACHINE_ARCH} == "powerpc" || \
-    ${MACHINE_ARCH} == "sparc" || \
-    ${MACHINE_ARCH} == "sparc64" || \
-    ${MACHINE_ARCH} == "x86_64" || \
-    ${MACHINE_ARCH} == "i386" || \
-    ${MACHINE_ARCH} == "m68000" || \
-    ${MACHINE_ARCH} == "aarch64" || \
-    ${MACHINE_ARCH} == "arm" || \
-    !empty(MACHINE_ARCH:Mearm*) || \
-    ${MACHINE} == "next68k" || \
-    ${MACHINE} == "sun3" || \
-    ${MACHINE} == "mvme68k" || \
-    ${MACHINE} == "hp300" || \
-    ${MACHINE} == "news68k" || \
-    ${MACHINE} == "arm26"
-OBJECT_FMT?=ELF
-.else
-OBJECT_FMT?=a.out
-.endif
+# All platforms are ELF.
+#
+OBJECT_FMT=	ELF
 
 # Location of the file that contains the major and minor numbers of the
 # version of a shared library.  If this file exists a shared library


--_----------=_167728960260190--