[pkgsrc/trunk]: pkgsrc/mk Teach the new tools framework about ${STRIP}, which...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/mk Teach the new tools framework about ${STRIP}, which...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 01:44:49 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/3fb4000a3ee6
branches:  trunk
changeset: 493366:3fb4000a3ee6
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed May 04 06:42:43 2005 +0000

description:
Teach the new tools framework about ${STRIP}, which is used in some
packages to strip installed executables.  If INSTALL_UNSTRIPPED ==
"yes", then we create a "strip" wrapper in ${TOOLS_DIR} that just
calls ${TRUE} by considering ${TRUE} the system-supplied strip command.

diffstat:

 mk/bsd.pkg.mk               |  6 +++---
 mk/tools/defaults.mk        |  3 ++-
 mk/tools/make.mk            |  4 ++--
 mk/tools/tools.AIX.mk       |  3 ++-
 mk/tools/tools.BSDOS.mk     |  4 +++-
 mk/tools/tools.Darwin.mk    |  4 +++-
 mk/tools/tools.DragonFly.mk |  4 +++-
 mk/tools/tools.FreeBSD.mk   |  4 +++-
 mk/tools/tools.IRIX.mk      |  3 ++-
 mk/tools/tools.Interix.mk   |  3 ++-
 mk/tools/tools.Linux.mk     |  4 +++-
 mk/tools/tools.NetBSD.mk    |  4 +++-
 mk/tools/tools.OSF1.mk      |  4 +++-
 mk/tools/tools.OpenBSD.mk   |  4 +++-
 mk/tools/tools.SunOS.mk     |  4 +++-
 mk/tools/tools.UnixWare.mk  |  3 ++-
 16 files changed, 42 insertions(+), 19 deletions(-)

diffs (284 lines):

diff -r 7ff68782ca76 -r 3fb4000a3ee6 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Wed May 04 06:25:59 2005 +0000
+++ b/mk/bsd.pkg.mk     Wed May 04 06:42:43 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1626 2005/05/04 04:23:34 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1627 2005/05/04 06:42:43 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -943,8 +943,8 @@
                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
+               sed sh shlock sort strip 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 7ff68782ca76 -r 3fb4000a3ee6 mk/tools/defaults.mk
--- a/mk/tools/defaults.mk      Wed May 04 06:25:59 2005 +0000
+++ b/mk/tools/defaults.mk      Wed May 04 06:42:43 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.6 2005/05/03 20:41:53 jlam Exp $
+# $NetBSD: defaults.mk,v 1.7 2005/05/04 06:42:43 jlam Exp $
 
 .if !defined(TOOLS_DEFAULTS_MK)
 TOOLS_DEFAULTS_MK=     defined
@@ -68,6 +68,7 @@
 _TOOLS_VARNAME.sh=             SH
 _TOOLS_VARNAME.shlock=         SHLOCK
 _TOOLS_VARNAME.sort=           SORT
+_TOOLS_VARNAME.strip=          STRIP
 _TOOLS_VARNAME.tail=           TAIL
 _TOOLS_VARNAME.tbl=            TBL
 _TOOLS_VARNAME.tee=            TEE
diff -r 7ff68782ca76 -r 3fb4000a3ee6 mk/tools/make.mk
--- a/mk/tools/make.mk  Wed May 04 06:25:59 2005 +0000
+++ b/mk/tools/make.mk  Wed May 04 06:42:43 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: make.mk,v 1.4 2005/05/02 21:10:03 jlam Exp $
+# $NetBSD: make.mk,v 1.5 2005/05/04 06:42:43 jlam Exp $
 #
 # This Makefile fragment creates a tool called "make" under ${TOOLS_DIR}
 # that corresponds to the make program used to build the package.
@@ -20,6 +20,6 @@
 .endif
 
 TOOLS_SYMLINK+=                make
-TOOLS_REAL_CMD.make=   ${MAKE_PROGRAM}
+TOOLS_REAL_CMD.make?=  ${MAKE_PROGRAM}
 
 CONFIGURE_ENV+=                MAKE=${MAKE_PROGRAM:T:Q}
diff -r 7ff68782ca76 -r 3fb4000a3ee6 mk/tools/tools.AIX.mk
--- a/mk/tools/tools.AIX.mk     Wed May 04 06:25:59 2005 +0000
+++ b/mk/tools/tools.AIX.mk     Wed May 04 06:42:43 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.AIX.mk,v 1.5 2005/05/03 16:30:34 jlam Exp $
+# $NetBSD: tools.AIX.mk,v 1.6 2005/05/04 06:42:43 jlam Exp $
 #
 # System-supplied tools for the AIX operating system.
 
@@ -41,6 +41,7 @@
 TOOLS_PLATFORM.sh?=            /bin/sh
 TOOLS_PLATFORM.shlock?=                /usr/bin/shlock
 TOOLS_PLATFORM.sort?=          /usr/bin/sort
+TOOLS_PLATFORM.strip?=         ${TOOLS_PLATFORM.true}
 TOOLS_PLATFORM.tail?=          /usr/bin/tail
 TOOLS_PLATFORM.tee?=           /usr/bin/tee
 TOOLS_PLATFORM.test?=          test                    # shell builtin
diff -r 7ff68782ca76 -r 3fb4000a3ee6 mk/tools/tools.BSDOS.mk
--- a/mk/tools/tools.BSDOS.mk   Wed May 04 06:25:59 2005 +0000
+++ b/mk/tools/tools.BSDOS.mk   Wed May 04 06:42:43 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.BSDOS.mk,v 1.7 2005/05/03 20:41:53 jlam Exp $
+# $NetBSD: tools.BSDOS.mk,v 1.8 2005/05/04 06:42:43 jlam Exp $
 #
 # System-supplied tools for the BSD/OS operating system.
 
@@ -47,6 +47,8 @@
 TOOLS_PLATFORM.sed?=           /usr/bin/sed
 TOOLS_PLATFORM.sh?=            /bin/bash
 TOOLS_PLATFORM.sort?=          /usr/bin/sort
+TOOLS_PLATFORM.strip?=         \
+       ${_INSTALL_UNSTRIPPED:D${TOOLS_PLATFORM.true}:U/usr/bin/strip}
 TOOLS_PLATFORM.tail?=          /usr/bin/tail
 TOOLS_PLATFORM.tee?=           /usr/bin/tee
 TOOLS_PLATFORM.test?=          test                    # shell builtin
diff -r 7ff68782ca76 -r 3fb4000a3ee6 mk/tools/tools.Darwin.mk
--- a/mk/tools/tools.Darwin.mk  Wed May 04 06:25:59 2005 +0000
+++ b/mk/tools/tools.Darwin.mk  Wed May 04 06:42:43 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Darwin.mk,v 1.7 2005/05/03 21:06:14 jlam Exp $
+# $NetBSD: tools.Darwin.mk,v 1.8 2005/05/04 06:42:43 jlam Exp $
 #
 # System-supplied tools for the Darwin (Mac OS X) operating system.
 
@@ -49,6 +49,8 @@
 TOOLS_PLATFORM.sed?=           /usr/bin/sed
 TOOLS_PLATFORM.sh?=            /bin/sh
 TOOLS_PLATFORM.sort?=          /usr/bin/sort
+TOOLS_PLATFORM.strip?=         \
+       ${_INSTALL_UNSTRIPPED:D${TOOLS_PLATFORM.true}:U/usr/bin/strip}
 TOOLS_PLATFORM.tail?=          /usr/bin/tail
 TOOLS_PLATFORM.tee?=           /usr/bin/tee
 TOOLS_PLATFORM.test?=          test                    # shell builtin
diff -r 7ff68782ca76 -r 3fb4000a3ee6 mk/tools/tools.DragonFly.mk
--- a/mk/tools/tools.DragonFly.mk       Wed May 04 06:25:59 2005 +0000
+++ b/mk/tools/tools.DragonFly.mk       Wed May 04 06:42:43 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.DragonFly.mk,v 1.8 2005/05/03 20:41:53 jlam Exp $
+# $NetBSD: tools.DragonFly.mk,v 1.9 2005/05/04 06:42:43 jlam Exp $
 #
 # System-supplied tools for the DragonFly operating system.
 
@@ -51,6 +51,8 @@
 TOOLS_PLATFORM.sh?=            /bin/sh
 TOOLS_PLATFORM.shlock?=                /usr/bin/shlock
 TOOLS_PLATFORM.sort?=          /usr/bin/sort
+TOOLS_PLATFORM.strip?=         \
+       ${_INSTALL_UNSTRIPPED:D${TOOLS_PLATFORM.true}:U/usr/bin/strip}
 TOOLS_PLATFORM.tail?=          /usr/bin/tail
 TOOLS_PLATFORM.tbl?=           /usr/bin/tbl
 TOOLS_PLATFORM.tee?=           /usr/bin/tee
diff -r 7ff68782ca76 -r 3fb4000a3ee6 mk/tools/tools.FreeBSD.mk
--- a/mk/tools/tools.FreeBSD.mk Wed May 04 06:25:59 2005 +0000
+++ b/mk/tools/tools.FreeBSD.mk Wed May 04 06:42:43 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.FreeBSD.mk,v 1.8 2005/05/03 20:41:53 jlam Exp $
+# $NetBSD: tools.FreeBSD.mk,v 1.9 2005/05/04 06:42:43 jlam Exp $
 #
 # System-supplied tools for the FreeBSD operating system.
 
@@ -53,6 +53,8 @@
 TOOLS_PLATFORM.sh?=            /bin/sh
 TOOLS_PLATFORM.shlock?=                /usr/bin/shlock
 TOOLS_PLATFORM.sort?=          /usr/bin/sort
+TOOLS_PLATFORM.strip?=         \
+       ${_INSTALL_UNSTRIPPED:D${TOOLS_PLATFORM.true}:U/usr/bin/strip}
 TOOLS_PLATFORM.tail?=          /usr/bin/tail
 TOOLS_PLATFORM.tbl?=           /usr/bin/tbl
 TOOLS_PLATFORM.tee?=           /usr/bin/tee
diff -r 7ff68782ca76 -r 3fb4000a3ee6 mk/tools/tools.IRIX.mk
--- a/mk/tools/tools.IRIX.mk    Wed May 04 06:25:59 2005 +0000
+++ b/mk/tools/tools.IRIX.mk    Wed May 04 06:42:43 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.IRIX.mk,v 1.6 2005/05/03 20:41:53 jlam Exp $
+# $NetBSD: tools.IRIX.mk,v 1.7 2005/05/04 06:42:43 jlam Exp $
 #
 # System-supplied tools for the IRIX operating system.
 
@@ -48,6 +48,7 @@
 TOOLS_PLATFORM.sed?=           /sbin/sed
 TOOLS_PLATFORM.sh?=            /bin/ksh
 TOOLS_PLATFORM.sort?=          /usr/bin/sort
+TOOLS_PLATFORM.strip?=         ${TOOLS_PLATFORM.true}  # XXX
 TOOLS_PLATFORM.tail?=          /usr/bin/tail
 TOOLS_PLATFORM.tee?=           /usr/bin/tee
 TOOLS_PLATFORM.test?=          test                    # shell builtin
diff -r 7ff68782ca76 -r 3fb4000a3ee6 mk/tools/tools.Interix.mk
--- a/mk/tools/tools.Interix.mk Wed May 04 06:25:59 2005 +0000
+++ b/mk/tools/tools.Interix.mk Wed May 04 06:42:43 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Interix.mk,v 1.6 2005/05/03 20:41:53 jlam Exp $
+# $NetBSD: tools.Interix.mk,v 1.7 2005/05/04 06:42:43 jlam Exp $
 #
 # System-supplied tools for the Interix operating system.
 
@@ -43,6 +43,7 @@
 TOOLS_PLATFORM.rmdir?=         /bin/rmdir
 TOOLS_PLATFORM.sh?=            /bin/sh
 TOOLS_PLATFORM.sort?=          /bin/sort
+TOOLS_PLATFORM.strip?=         ${TOOLS_PLATFORM.true}  # XXX
 TOOLS_PLATFORM.tail?=          /bin/tail
 TOOLS_PLATFORM.tee?=           /bin/tee
 TOOLS_PLATFORM.test?=          /bin/test
diff -r 7ff68782ca76 -r 3fb4000a3ee6 mk/tools/tools.Linux.mk
--- a/mk/tools/tools.Linux.mk   Wed May 04 06:25:59 2005 +0000
+++ b/mk/tools/tools.Linux.mk   Wed May 04 06:42:43 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Linux.mk,v 1.9 2005/05/03 20:41:53 jlam Exp $
+# $NetBSD: tools.Linux.mk,v 1.10 2005/05/04 06:42:43 jlam Exp $
 #
 # System-supplied tools for the Linux operating system.
 
@@ -111,6 +111,8 @@
 .elif exists(/usr/bin/sort)
 TOOLS_PLATFORM.sort?=          /usr/bin/sort
 .endif
+TOOLS_PLATFORM.strip?=         \
+       ${_INSTALL_UNSTRIPPED:D${TOOLS_PLATFORM.true}:U/usr/bin/strip}
 TOOLS_PLATFORM.tail?=          /usr/bin/tail
 TOOLS_PLATFORM.tee?=           /usr/bin/tee
 TOOLS_PLATFORM.test?=          test                    # shell builtin
diff -r 7ff68782ca76 -r 3fb4000a3ee6 mk/tools/tools.NetBSD.mk
--- a/mk/tools/tools.NetBSD.mk  Wed May 04 06:25:59 2005 +0000
+++ b/mk/tools/tools.NetBSD.mk  Wed May 04 06:42:43 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.8 2005/05/03 20:41:53 jlam Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.9 2005/05/04 06:42:43 jlam Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
@@ -65,6 +65,8 @@
 TOOLS_PLATFORM.sh?=            /bin/sh
 TOOLS_PLATFORM.shlock?=                /usr/bin/shlock
 TOOLS_PLATFORM.sort?=          /usr/bin/sort
+TOOLS_PLATFORM.strip?=         \
+       ${_INSTALL_UNSTRIPPED:D${TOOLS_PLATFORM.true}:U/usr/bin/strip}
 TOOLS_PLATFORM.tail?=          /usr/bin/tail
 TOOLS_PLATFORM.tbl?=           /usr/bin/tbl
 TOOLS_PLATFORM.tee?=           /usr/bin/tee
diff -r 7ff68782ca76 -r 3fb4000a3ee6 mk/tools/tools.OSF1.mk
--- a/mk/tools/tools.OSF1.mk    Wed May 04 06:25:59 2005 +0000
+++ b/mk/tools/tools.OSF1.mk    Wed May 04 06:42:43 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OSF1.mk,v 1.5 2005/05/03 16:30:34 jlam Exp $
+# $NetBSD: tools.OSF1.mk,v 1.6 2005/05/04 06:42:43 jlam Exp $
 #
 # System-supplied tools for the OSF/1 operating system.
 
@@ -42,6 +42,8 @@
 TOOLS_PLATFORM.rmdir?=         /bin/rmdir
 TOOLS_PLATFORM.sh?=            /bin/ksh
 TOOLS_PLATFORM.sort?=          /usr/bin/sort
+TOOLS_PLATFORM.strip?=         \
+       ${_INSTALL_UNSTRIPPED:D${TOOLS_PLATFORM.true}:U/usr/ccs/bin/strip}
 TOOLS_PLATFORM.tail?=          /usr/bin/tail
 TOOLS_PLATFORM.tee?=           /usr/bin/tee
 TOOLS_PLATFORM.test?=          test                    # shell builtin
diff -r 7ff68782ca76 -r 3fb4000a3ee6 mk/tools/tools.OpenBSD.mk
--- a/mk/tools/tools.OpenBSD.mk Wed May 04 06:25:59 2005 +0000
+++ b/mk/tools/tools.OpenBSD.mk Wed May 04 06:42:43 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OpenBSD.mk,v 1.7 2005/05/03 20:41:53 jlam Exp $
+# $NetBSD: tools.OpenBSD.mk,v 1.8 2005/05/04 06:42:43 jlam Exp $
 #
 # System-supplied tools for the OpenBSD operating system.
 
@@ -52,6 +52,8 @@
 TOOLS_PLATFORM.sed?=           /usr/bin/sed
 TOOLS_PLATFORM.sh?=            /bin/sh
 TOOLS_PLATFORM.sort?=          /usr/bin/sort
+TOOLS_PLATFORM.strip?=         \
+       ${_INSTALL_UNSTRIPPED:D${TOOLS_PLATFORM.true}:U/usr/bin/strip}
 TOOLS_PLATFORM.tail?=          /usr/bin/tail
 TOOLS_PLATFORM.tbl?=           /usr/bin/tbl
 TOOLS_PLATFORM.tee?=           /usr/bin/tee
diff -r 7ff68782ca76 -r 3fb4000a3ee6 mk/tools/tools.SunOS.mk
--- a/mk/tools/tools.SunOS.mk   Wed May 04 06:25:59 2005 +0000
+++ b/mk/tools/tools.SunOS.mk   Wed May 04 06:42:43 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.SunOS.mk,v 1.8 2005/05/03 20:41:53 jlam Exp $
+# $NetBSD: tools.SunOS.mk,v 1.9 2005/05/04 06:42:43 jlam Exp $
 #
 # System-supplied tools for the Solaris operating system.
 
@@ -55,6 +55,8 @@
 TOOLS_PLATFORM.rmdir?=         /usr/bin/rmdir
 TOOLS_PLATFORM.sh?=            /bin/ksh
 TOOLS_PLATFORM.sort?=          /usr/bin/sort
+TOOLS_PLATFORM.strip?=         \
+       ${_INSTALL_UNSTRIPPED:D${TOOLS_PLATFORM.true}:U/usr/ccs/bin/strip}
 TOOLS_PLATFORM.tail?=          /usr/xpg4/bin/tail
 TOOLS_PLATFORM.tee?=           /usr/bin/tee
 TOOLS_PLATFORM.test?=          test                    # shell builtin
diff -r 7ff68782ca76 -r 3fb4000a3ee6 mk/tools/tools.UnixWare.mk
--- a/mk/tools/tools.UnixWare.mk        Wed May 04 06:25:59 2005 +0000
+++ b/mk/tools/tools.UnixWare.mk        Wed May 04 06:42:43 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.UnixWare.mk,v 1.6 2005/05/03 20:41:53 jlam Exp $
+# $NetBSD: tools.UnixWare.mk,v 1.7 2005/05/04 06:42:43 jlam Exp $
 #
 # System-supplied tools for the UnixWare 7 operating system.
 
@@ -40,6 +40,7 @@
 TOOLS_PLATFORM.sed?=           /usr/bin/sed
 TOOLS_PLATFORM.sh?=            /usr/bin/ksh
 TOOLS_PLATFORM.sort?=          /usr/bin/sort
+TOOLS_PLATFORM.strip?=         ${TOOLS_PLATFORM.true}  # XXX
 TOOLS_PLATFORM.tail?=          /usr/bin/tail
 TOOLS_PLATFORM.tee?=           /usr/bin/tee
 TOOLS_PLATFORM.test?=          test                    # shell builtin
Prev by Date: [pkgsrc/trunk]: pkgsrc/mk/tools If we're using the tools from the packages, s...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Initial import of nasd-1.3, a prototype storage im...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/mk/tools If we're using the tools from the packages, s...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Initial import of nasd-1.3, a prototype storage im...
Indexes:
Home | Main Index | Thread Index | Old Index