[pkgsrc/trunk]: pkgsrc/mk mk: Enable mktools on supported platforms.

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/41febba5197c
branches:  trunk
changeset: 385849:41febba5197c
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue Sep 27 08:46:32 2022 +0000

description:
mk: Enable mktools on supported platforms.

The default is now auto detection, which will enable mktools on platforms that
have set _OPSYS_SUPPORTS_MKTOOLS.  Users can still override either way via
PKGSRC_USE_MKTOOLS.

Please add and enable on other platforms once they have been verified.

diffstat:

 mk/bsd.prefs.mk       |   6 ++++--
 mk/defaults/mk.conf   |  16 ++++++++--------
 mk/platform/Darwin.mk |   3 ++-
 mk/platform/Linux.mk  |   3 ++-
 mk/platform/NetBSD.mk |   3 ++-
 mk/platform/SunOS.mk  |   3 ++-
 6 files changed, 20 insertions(+), 14 deletions(-)

diffs (119 lines):

diff -r d64265e3a645 -r 41febba5197c mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Tue Sep 27 08:21:23 2022 +0000
+++ b/mk/bsd.prefs.mk   Tue Sep 27 08:46:32 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.426 2022/08/06 07:38:44 nia Exp $
+# $NetBSD: bsd.prefs.mk,v 1.427 2022/09/27 08:46:32 jperkin Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -880,7 +880,9 @@
 
 # Use C-based tools to speed up pkgsrc infrastructure tasks.
 .if empty(PKGPATH:Mpkgtools/mktools) && \
-    ${PKGSRC_USE_MKTOOLS:tl} == "yes"
+    (${PKGSRC_USE_MKTOOLS:tl} == "yes" || \
+    (${PKGSRC_USE_MKTOOLS:tl} == "auto" && \
+     ${_OPSYS_SUPPORTS_MKTOOLS:Uno} == "yes"))
 _PKGSRC_USE_MKTOOLS=   yes
 .else
 _PKGSRC_USE_MKTOOLS=   no
diff -r d64265e3a645 -r 41febba5197c mk/defaults/mk.conf
--- a/mk/defaults/mk.conf       Tue Sep 27 08:21:23 2022 +0000
+++ b/mk/defaults/mk.conf       Tue Sep 27 08:46:32 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.335 2022/08/01 07:58:21 wiz Exp $
+# $NetBSD: mk.conf,v 1.336 2022/09/27 08:46:32 jperkin Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -22,14 +22,14 @@
 # Possible: yes, no, auto
 # Default: auto (automatic detection, see above)
 
-PKGSRC_USE_MKTOOLS?=   no
-# Use C-based tools for various parts of the infrastructure instead of the
-# slower shell-based constructs.  Significantly improves performance, but
-# not enabled by default until portability across all platforms has been
-# confirmed.
+PKGSRC_USE_MKTOOLS?=   auto
+# Use C-based tools for various parts of the infrastructure instead of slower
+# shell scripts.  Significantly improves performance, but untested across all
+# pkgsrc platforms, so currently the default is "auto" which enables mktools
+# on platforms that have _OPSYS_SUPPORTS_MKTOOLS set to "yes".
 #
-# Possible: yes, no
-# Default: no
+# Possible: yes, no, auto
+# Default: auto (automatic detection, see above)
 
 USE_PKG_ADMIN_DIGEST?= no
 # Record file digests instead of extracing the NetBSD RCS ID from files.
diff -r d64265e3a645 -r 41febba5197c mk/platform/Darwin.mk
--- a/mk/platform/Darwin.mk     Tue Sep 27 08:21:23 2022 +0000
+++ b/mk/platform/Darwin.mk     Tue Sep 27 08:46:32 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.117 2022/09/13 05:37:50 tnn Exp $
+# $NetBSD: Darwin.mk,v 1.118 2022/09/27 08:46:33 jperkin Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -227,6 +227,7 @@
 BUILDLINK_TRANSFORM+=  rm:-Wl,--no-undefined
 
 _OPSYS_SUPPORTS_CWRAPPERS=     yes
+_OPSYS_SUPPORTS_MKTOOLS=       yes
 
 _OPSYS_CAN_CHECK_SHLIBS=       yes # check shared libraries using otool(1)
 
diff -r d64265e3a645 -r 41febba5197c mk/platform/Linux.mk
--- a/mk/platform/Linux.mk      Tue Sep 27 08:21:23 2022 +0000
+++ b/mk/platform/Linux.mk      Tue Sep 27 08:46:32 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.90 2022/05/01 08:10:11 nia Exp $
+# $NetBSD: Linux.mk,v 1.91 2022/09/27 08:46:33 jperkin Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -133,6 +133,7 @@
 _STRIPFLAG_INSTALL?=   ${_INSTALL_UNSTRIPPED:D:U-s}    # install(1) option to strip
 
 _OPSYS_SUPPORTS_CWRAPPERS=     yes
+_OPSYS_SUPPORTS_MKTOOLS=       yes
 
 _OPSYS_CAN_CHECK_SHLIBS=       yes # use readelf in check/bsd.check-vars.mk
 _OPSYS_CAN_CHECK_SSP=          no  # only supports libssp at this time
diff -r d64265e3a645 -r 41febba5197c mk/platform/NetBSD.mk
--- a/mk/platform/NetBSD.mk     Tue Sep 27 08:21:23 2022 +0000
+++ b/mk/platform/NetBSD.mk     Tue Sep 27 08:46:32 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.72 2022/05/21 07:37:39 nia Exp $
+# $NetBSD: NetBSD.mk,v 1.73 2022/09/27 08:46:33 jperkin Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -198,6 +198,7 @@
 .endif
 
 _OPSYS_SUPPORTS_CWRAPPERS=     yes
+_OPSYS_SUPPORTS_MKTOOLS=       yes
 
 # use readelf in check/bsd.check-vars.mk
 _OPSYS_CAN_CHECK_RELRO=                yes
diff -r d64265e3a645 -r 41febba5197c mk/platform/SunOS.mk
--- a/mk/platform/SunOS.mk      Tue Sep 27 08:21:23 2022 +0000
+++ b/mk/platform/SunOS.mk      Tue Sep 27 08:46:32 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.83 2022/08/09 11:31:14 jperkin Exp $
+# $NetBSD: SunOS.mk,v 1.84 2022/09/27 08:46:33 jperkin Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -136,6 +136,7 @@
 
 _OPSYS_SUPPORTS_CTF=           yes # Compact Type Format conversion.
 _OPSYS_SUPPORTS_FORTIFY=       yes # Requires GCC
+_OPSYS_SUPPORTS_MKTOOLS=       yes
 _OPSYS_SUPPORTS_SSP?=          yes # Requires GCC
 _OPSYS_CAN_CHECK_SHLIBS=       yes # Requires readelf