CVS commit: pkgsrc/pkgtools/bootstrap-mk-files/files/mods

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Dec  3 12:58:09 UTC 2024

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

Log Message:
bootstrap-mk-files: Fix syntax error on OpenBSD.

OS_VERSION is not defined, and you cannot perform numerical comparisons
on strings anyway.  Reduce some diffs to the main file while here.


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

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

Modified files:

Index: pkgsrc/pkgtools/bootstrap-mk-files/files/mods/OpenBSD.bsd.own.mk.in
diff -u pkgsrc/pkgtools/bootstrap-mk-files/files/mods/OpenBSD.bsd.own.mk.in:1.7 pkgsrc/pkgtools/bootstrap-mk-files/files/mods/OpenBSD.bsd.own.mk.in:1.8
--- pkgsrc/pkgtools/bootstrap-mk-files/files/mods/OpenBSD.bsd.own.mk.in:1.7     Tue May  9 17:02:32 2023
+++ pkgsrc/pkgtools/bootstrap-mk-files/files/mods/OpenBSD.bsd.own.mk.in Tue Dec  3 12:58:09 2024
@@ -1,4 +1,4 @@
-#      $NetBSD: OpenBSD.bsd.own.mk.in,v 1.7 2023/05/09 17:02:32 schmonz Exp $
+#      $NetBSD: OpenBSD.bsd.own.mk.in,v 1.8 2024/12/03 12:58:09 jperkin Exp $
 
 .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1
@@ -97,21 +97,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} == "powerpc" || \
-    ${MACHINE_ARCH} == "sparc" || \
-    ${OS_VERSION} >= 5.4 || \
-    ( ${MACHINE_ARCH} == "i386" && ${OS_VERSION} >= 3.4 )
-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