pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/tools mk: Only create GNU missing wrappers when nee...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4585068217e8
branches:  trunk
changeset: 388606:4585068217e8
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Nov 23 13:06:33 2022 +0000

description:
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.

diffstat:

 mk/tools/autoconf.mk |  8 +++++---
 mk/tools/automake.mk |  8 +++++---
 mk/tools/intltool.mk |  4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diffs (64 lines):

diff -r 5bbb8f7c74d7 -r 4585068217e8 mk/tools/autoconf.mk
--- a/mk/tools/autoconf.mk      Wed Nov 23 12:46:46 2022 +0000
+++ b/mk/tools/autoconf.mk      Wed Nov 23 13:06:33 2022 +0000
@@ -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+=      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)
diff -r 5bbb8f7c74d7 -r 4585068217e8 mk/tools/automake.mk
--- a/mk/tools/automake.mk      Wed Nov 23 12:46:46 2022 +0000
+++ b/mk/tools/automake.mk      Wed Nov 23 13:06:33 2022 +0000
@@ -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 @@
                                        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)
diff -r 5bbb8f7c74d7 -r 4585068217e8 mk/tools/intltool.mk
--- a/mk/tools/intltool.mk      Wed Nov 23 12:46:46 2022 +0000
+++ b/mk/tools/intltool.mk      Wed Nov 23 13:06:33 2022 +0000
@@ -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_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_}}



Home | Main Index | Thread Index | Old Index