[pkgsrc/trunk]: pkgsrc/mk Split out ldconfig handling from the USE_TOOLS proc...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/aa7afce5452c
branches:  trunk
changeset: 493624:aa7afce5452c
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue May 10 20:14:27 2005 +0000

description:
Split out ldconfig handling from the USE_TOOLS processing in replace.mk.
This makes more sense since there is never going to be a pkgsrc
replacement for ldconfig.  We now always create an ldconfig tool in
${TOOLS_DIR} that either calls the system-supplied one if it exists,
or is a no-op.

diffstat:

 mk/bsd.pkg.mk              |   8 ++++----
 mk/tools/bsd.tools.mk      |   3 ++-
 mk/tools/ldconfig.mk       |  17 +++++++++++++++++
 mk/tools/tools.IRIX.mk     |   3 +--
 mk/tools/tools.Interix.mk  |   3 +--
 mk/tools/tools.NetBSD.mk   |   4 +---
 mk/tools/tools.OSF1.mk     |   3 +--
 mk/tools/tools.SunOS.mk    |   3 +--
 mk/tools/tools.UnixWare.mk |   3 +--
 9 files changed, 29 insertions(+), 18 deletions(-)

diffs (163 lines):

diff -r b18dfea3bc83 -r aa7afce5452c mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Tue May 10 19:56:51 2005 +0000
+++ b/mk/bsd.pkg.mk     Tue May 10 20:14:27 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1634 2005/05/10 19:52:30 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1635 2005/05/10 20:14:27 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -965,9 +965,9 @@
 PKGSRC_USE_TOOLS+=                                                     \
        [ awk basename cat chgrp chmod chown cmp cp cut date dirname    \
        echo egrep env expr false fgrep file find grep gtar gunzip      \
-       gzcat gzip head hostname id install ldconfig ln ls m4 mkdir     \
-       mtree mv nice pax pwd rm rmdir sed sh shlock sort tail tee test \
-       touch tr true tsort wc xargs
+       gzcat gzip head hostname id install ln ls m4 mkdir mtree mv     \
+       nice pax pwd rm rmdir sed sh shlock sort tail tee test touch tr \
+       true tsort wc xargs
 
 # We need a mail command to send mail to ${PKGSRC_MESSAGE_RECIPIENTS}.
 .if !empty(PKGSRC_MESSAGE_RECIPIENTS)
diff -r b18dfea3bc83 -r aa7afce5452c mk/tools/bsd.tools.mk
--- a/mk/tools/bsd.tools.mk     Tue May 10 19:56:51 2005 +0000
+++ b/mk/tools/bsd.tools.mk     Tue May 10 20:14:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.tools.mk,v 1.18 2005/05/10 19:52:30 jlam Exp $
+# $NetBSD: bsd.tools.mk,v 1.19 2005/05/10 20:14:27 jlam Exp $
 #
 # This Makefile fragment creates tools under ${TOOLS_DIR} that are
 # found before similarly-named tools in the system path.
@@ -75,6 +75,7 @@
 .include "../../mk/tools/automake.mk"
 .include "../../mk/tools/autoconf.mk"
 .include "../../mk/tools/texinfo.mk"
+.include "../../mk/tools/ldconfig.mk"
 .include "../../mk/tools/rpcgen.mk"
 .include "../../mk/tools/strip.mk"
 .include "../../mk/tools/replace.mk"
diff -r b18dfea3bc83 -r aa7afce5452c mk/tools/ldconfig.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mk/tools/ldconfig.mk      Tue May 10 20:14:27 2005 +0000
@@ -0,0 +1,17 @@
+# $NetBSD: ldconfig.mk,v 1.1 2005/05/10 20:14:27 jlam Exp $
+#
+# Depending on whether the platform has ldconfig, we cause
+# ${TOOLS_DIR}/bin/ldconfig to be either the correct ldconfig tool or
+# a no-op.
+#
+.if !defined(TOOLS_PLATFORM.ldconfig)
+TOOLS_NOOP+=                   ldconfig
+.else
+TOOLS_CREATE+=                 ldconfig
+TOOLS_REAL_CMD.ldconfig=       ${TOOLS_PLATFORM.ldconfig}
+.endif
+
+# Make ${LDCONFIG} call "ldconfig" through the PATH, which should find
+# the one under ${TOOLS_DIR}.
+#
+LDCONFIG?=     ldconfig
diff -r b18dfea3bc83 -r aa7afce5452c mk/tools/tools.IRIX.mk
--- a/mk/tools/tools.IRIX.mk    Tue May 10 19:56:51 2005 +0000
+++ b/mk/tools/tools.IRIX.mk    Tue May 10 20:14:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.IRIX.mk,v 1.9 2005/05/10 19:56:51 jlam Exp $
+# $NetBSD: tools.IRIX.mk,v 1.10 2005/05/10 20:14:27 jlam Exp $
 #
 # System-supplied tools for the IRIX operating system.
 
@@ -33,7 +33,6 @@
 TOOLS_PLATFORM.head?=          /usr/bsd/head
 TOOLS_PLATFORM.hostname?=      /usr/bsd/hostname
 TOOLS_PLATFORM.id?=            /usr/bin/id
-TOOLS_PLATFORM.ldconfig?=      ${TOOLS_PLATFORM.true}
 TOOLS_PLATFORM.ln?=            /sbin/ln
 TOOLS_PLATFORM.ls?=            /sbin/ls
 TOOLS_PLATFORM.m4?=            /sbin/m4
diff -r b18dfea3bc83 -r aa7afce5452c mk/tools/tools.Interix.mk
--- a/mk/tools/tools.Interix.mk Tue May 10 19:56:51 2005 +0000
+++ b/mk/tools/tools.Interix.mk Tue May 10 20:14:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Interix.mk,v 1.9 2005/05/05 18:59:25 jlam Exp $
+# $NetBSD: tools.Interix.mk,v 1.10 2005/05/10 20:14:27 jlam Exp $
 #
 # System-supplied tools for the Interix operating system.
 
@@ -29,7 +29,6 @@
 TOOLS_PLATFORM.head?=          /bin/head
 TOOLS_PLATFORM.hostname?=      /bin/hostname
 TOOLS_PLATFORM.id?=            /bin/id
-TOOLS_PLATFORM.ldconfig?=      /bin/true
 TOOLS_PLATFORM.ln?=            /bin/ln
 TOOLS_PLATFORM.ls?=            /bin/ls
 TOOLS_PLATFORM.m4?=            /bin/m4
diff -r b18dfea3bc83 -r aa7afce5452c mk/tools/tools.NetBSD.mk
--- a/mk/tools/tools.NetBSD.mk  Tue May 10 19:56:51 2005 +0000
+++ b/mk/tools/tools.NetBSD.mk  Tue May 10 20:14:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.10 2005/05/10 19:56:51 jlam Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.11 2005/05/10 20:14:27 jlam Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
@@ -44,8 +44,6 @@
 TOOLS_PLATFORM.install?=       /usr/bin/install
 .if exists(/sbin/ldconfig)
 TOOLS_PLATFORM.ldconfig?=      /sbin/ldconfig
-.else
-TOOLS_PLATFORM.ldconfig?=      ${TOOLS_PLATFORM.true}
 .endif
 TOOLS_PLATFORM.lex?=           /usr/bin/lex
 TOOLS_PLATFORM.ln?=            /bin/ln
diff -r b18dfea3bc83 -r aa7afce5452c mk/tools/tools.OSF1.mk
--- a/mk/tools/tools.OSF1.mk    Tue May 10 19:56:51 2005 +0000
+++ b/mk/tools/tools.OSF1.mk    Tue May 10 20:14:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OSF1.mk,v 1.7 2005/05/10 19:56:51 jlam Exp $
+# $NetBSD: tools.OSF1.mk,v 1.8 2005/05/10 20:14:27 jlam Exp $
 #
 # System-supplied tools for the OSF/1 operating system.
 
@@ -29,7 +29,6 @@
 TOOLS_PLATFORM.head?=          /usr/bin/head
 TOOLS_PLATFORM.hostname?=      /bin/hostname
 TOOLS_PLATFORM.id?=            /usr/bin/id
-TOOLS_PLATFORM.ldconfig?=      ${TOOLS_PLATFORM.true}
 TOOLS_PLATFORM.ln?=            /bin/ln
 TOOLS_PLATFORM.ls?=            /bin/ls
 TOOLS_PLATFORM.m4?=            /usr/bin/m4
diff -r b18dfea3bc83 -r aa7afce5452c mk/tools/tools.SunOS.mk
--- a/mk/tools/tools.SunOS.mk   Tue May 10 19:56:51 2005 +0000
+++ b/mk/tools/tools.SunOS.mk   Tue May 10 20:14:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.SunOS.mk,v 1.10 2005/05/10 19:56:51 jlam Exp $
+# $NetBSD: tools.SunOS.mk,v 1.11 2005/05/10 20:14:27 jlam Exp $
 #
 # System-supplied tools for the Solaris operating system.
 
@@ -39,7 +39,6 @@
 TOOLS_PLATFORM.hostname?=      /bin/hostname
 TOOLS_PLATFORM.id?=            /usr/xpg4/bin/id
 TOOLS_PLATFORM.install?=       /usr/ucb/install
-TOOLS_PLATFORM.ldconfig?=      ${TOOLS_PLATFORM.true}
 TOOLS_PLATFORM.ln?=            /usr/bin/ln
 TOOLS_PLATFORM.ls?=            /usr/bin/ls
 TOOLS_PLATFORM.m4?=            /usr/ccs/bin/m4
diff -r b18dfea3bc83 -r aa7afce5452c mk/tools/tools.UnixWare.mk
--- a/mk/tools/tools.UnixWare.mk        Tue May 10 19:56:51 2005 +0000
+++ b/mk/tools/tools.UnixWare.mk        Tue May 10 20:14:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.UnixWare.mk,v 1.8 2005/05/10 19:56:51 jlam Exp $
+# $NetBSD: tools.UnixWare.mk,v 1.9 2005/05/10 20:14:27 jlam Exp $
 #
 # System-supplied tools for the UnixWare 7 operating system.
 
@@ -27,7 +27,6 @@
 TOOLS_PLATFORM.hostname?=      /usr/bin/hostname
 TOOLS_PLATFORM.id?=            /usr/bin/id
 TOOLS_PLATFORM.install?=       /usr/ucb/install
-TOOLS_PLATFORM.ldconfig?=      ${TOOLS_PLATFORM.true}
 TOOLS_PLATFORM.ln?=            /usr/bin/ln
 TOOLS_PLATFORM.ls?=            /usr/bin/ls
 TOOLS_PLATFORM.m4?=            /usr/ccs/bin/m4