CVS commit: pkgsrc/mk/tools

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Nov 23 13:06:33 UTC 2022

Modified Files:
        pkgsrc/mk/tools: autoconf.mk automake.mk intltool.mk

Log Message:
mk: Only create GNU missing wrappers when needed.

There is no point creating wrappers that warn about missing particular
autoconf, automake, and intltool commands if we aren't using GNU configure
at all.

Saves around 140 execs for every package without GNU_CONFIGURE=yes.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/mk/tools/autoconf.mk
cvs rdiff -u -r1.31 -r1.32 pkgsrc/mk/tools/automake.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/mk/tools/intltool.mk

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

Modified files:

Index: pkgsrc/mk/tools/autoconf.mk
diff -u pkgsrc/mk/tools/autoconf.mk:1.21 pkgsrc/mk/tools/autoconf.mk:1.22
--- pkgsrc/mk/tools/autoconf.mk:1.21    Wed May 15 10:49:28 2019
+++ pkgsrc/mk/tools/autoconf.mk Wed Nov 23 13:06:33 2022
@@ -1,4 +1,4 @@
-# $NetBSD: autoconf.mk,v 1.21 2019/05/15 10:49:28 leot Exp $
+# $NetBSD: autoconf.mk,v 1.22 2022/11/23 13:06:33 jperkin Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -83,9 +83,11 @@ _TOOLS_AC_NAMES+=    autoscan        autoscan-2.13
 _TOOLS_AC_NAMES+=      autoupdate      autoupdate-2.13
 _TOOLS_AC_NAMES+=      ifnames         ifnames-2.13
 
-.for _t_ in ${_TOOLS_AC_NAMES}
+.if defined(GNU_CONFIGURE)
+.  for _t_ in ${_TOOLS_AC_NAMES}
 _TOOLS_AC_TYPE.${_t_}?=        TOOLS_GNU_MISSING
-.endfor _t_
+.  endfor
+.endif
 
 .if !defined(TOOLS_IGNORE.autoconf) && !empty(USE_TOOLS:C/:.*//:Mautoconf)
 .  if !empty(PKGPATH:Mdevel/autoconf)

Index: pkgsrc/mk/tools/automake.mk
diff -u pkgsrc/mk/tools/automake.mk:1.31 pkgsrc/mk/tools/automake.mk:1.32
--- pkgsrc/mk/tools/automake.mk:1.31    Wed May 15 10:49:28 2019
+++ pkgsrc/mk/tools/automake.mk Wed Nov 23 13:06:33 2022
@@ -1,4 +1,4 @@
-# $NetBSD: automake.mk,v 1.31 2019/05/15 10:49:28 leot Exp $
+# $NetBSD: automake.mk,v 1.32 2022/11/23 13:06:33 jperkin Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -102,9 +102,11 @@ _TOOLS_AM_NAMES+=  automake        automake-1.4    
                                        automake-1.15                   \
                                        automake-1.16
 
-.for _t_ in ${_TOOLS_AM_NAMES}
+.if defined(GNU_CONFIGURE)
+.  for _t_ in ${_TOOLS_AM_NAMES}
 _TOOLS_AM_TYPE.${_t_}?=        TOOLS_GNU_MISSING
-.endfor
+.  endfor
+.endif
 
 .if !defined(TOOLS_IGNORE.automake) && !empty(USE_TOOLS:C/:.*//:Mautomake)
 .  if !empty(PKGPATH:Mdevel/automake)

Index: pkgsrc/mk/tools/intltool.mk
diff -u pkgsrc/mk/tools/intltool.mk:1.9 pkgsrc/mk/tools/intltool.mk:1.10
--- pkgsrc/mk/tools/intltool.mk:1.9     Wed Aug 22 20:48:37 2018
+++ pkgsrc/mk/tools/intltool.mk Wed Nov 23 13:06:33 2022
@@ -1,4 +1,4 @@
-# $NetBSD: intltool.mk,v 1.9 2018/08/22 20:48:37 maya Exp $
+# $NetBSD: intltool.mk,v 1.10 2022/11/23 13:06:33 jperkin Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -52,7 +52,7 @@ TOOLS_CREATE+=                ${_t_}
 TOOLS_PATH.${_t_}=     ${LOCALBASE}/bin/${_t_}
 .    endfor
 .  endif
-.else
+.elif defined(GNU_CONFIGURE)
 .  for _t_ in ${_TOOLS.intltool}
 TOOLS_BROKEN+=         ${_t_}
 TOOLS_PATH.${_t_}=     ${TOOLS_CMD.${_t_}}