[pkgsrc/trunk]: pkgsrc/mk Make strip/no-strip choice more consistent:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/14759e55a9b4
branches:  trunk
changeset: 481843:14759e55a9b4
user:      tv <tv%pkgsrc.org@localhost>
date:      Wed Oct 13 15:31:31 2004 +0000

description:
Make strip/no-strip choice more consistent:
Move check for INSTALL_UNSTRIPPED to the platform/*.mk files, alongside
existing check for DEBUG_FLAGS.

diffstat:

 mk/bsd.pkg.mk           |  9 +--------
 mk/platform/AIX.mk      |  4 ++--
 mk/platform/BSDOS.mk    |  4 ++--
 mk/platform/Darwin.mk   |  4 ++--
 mk/platform/FreeBSD.mk  |  4 ++--
 mk/platform/IRIX.mk     |  4 ++--
 mk/platform/Interix.mk  |  4 ++--
 mk/platform/Linux.mk    |  4 ++--
 mk/platform/NetBSD.mk   |  4 ++--
 mk/platform/OpenBSD.mk  |  4 ++--
 mk/platform/SunOS.mk    |  4 ++--
 mk/platform/UnixWare.mk |  4 ++--
 12 files changed, 23 insertions(+), 30 deletions(-)

diffs (225 lines):

diff -r 50ba18045e1a -r 14759e55a9b4 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Wed Oct 13 15:24:44 2004 +0000
+++ b/mk/bsd.pkg.mk     Wed Oct 13 15:31:31 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1516 2004/10/12 18:29:25 tv Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1517 2004/10/13 15:31:31 tv Exp $
 #
 # This file is in the public domain.
 #
@@ -631,17 +631,10 @@
 .endif # NO_WRKSUBDIR
 
 # A few aliases for *-install targets
-.if !defined(INSTALL_UNSTRIPPED) || empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])
 INSTALL_PROGRAM?=      \
        ${INSTALL} ${COPY} ${_STRIPFLAG_INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
 INSTALL_GAME?=         \
        ${INSTALL} ${COPY} ${_STRIPFLAG_INSTALL} -o ${GAMEOWN} -g ${GAMEGRP} -m ${GAMEMODE}
-.else
-INSTALL_PROGRAM?=      \
-       ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
-INSTALL_GAME?=         \
-       ${INSTALL} ${COPY} -o ${GAMEOWN} -g ${GAMEGRP} -m ${GAMEMODE}
-.endif
 INSTALL_SCRIPT?=       \
        ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
 INSTALL_LIB?=          \
diff -r 50ba18045e1a -r 14759e55a9b4 mk/platform/AIX.mk
--- a/mk/platform/AIX.mk        Wed Oct 13 15:24:44 2004 +0000
+++ b/mk/platform/AIX.mk        Wed Oct 13 15:31:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: AIX.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
+# $NetBSD: AIX.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
 #
 # Variable definitions for the AIX operating system.
 
@@ -173,7 +173,7 @@
 LINK_ALL_LIBGCC_HACK=  -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
 .endif
 
-.if !defined(DEBUG_FLAGS)
+.if (!defined(INSTALL_UNSTRIPPED) || empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) && !defined(DEBUG_FLAGS)
 _STRIPFLAG_CC?=                -s      # cc(1) option to strip
 _STRIPFLAG_INSTALL?=   -s      # install(1) option to strip
 .endif
diff -r 50ba18045e1a -r 14759e55a9b4 mk/platform/BSDOS.mk
--- a/mk/platform/BSDOS.mk      Wed Oct 13 15:24:44 2004 +0000
+++ b/mk/platform/BSDOS.mk      Wed Oct 13 15:31:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: BSDOS.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
+# $NetBSD: BSDOS.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
 #
 # Variable definitions for the BSD/OS operating system.
 
@@ -152,7 +152,7 @@
 _OPSYS_WHOLE_ARCHIVE_FLAG=     -Wl,--whole-archive
 _OPSYS_NO_WHOLE_ARCHIVE_FLAG=  -Wl,--no-whole-archive
 
-.if !defined(DEBUG_FLAGS)
+.if (!defined(INSTALL_UNSTRIPPED) || empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) && !defined(DEBUG_FLAGS)
 _STRIPFLAG_CC?=                -s      # cc(1) option to strip
 _STRIPFLAG_INSTALL?=   -s      # install(1) option to strip
 .endif
diff -r 50ba18045e1a -r 14759e55a9b4 mk/platform/Darwin.mk
--- a/mk/platform/Darwin.mk     Wed Oct 13 15:24:44 2004 +0000
+++ b/mk/platform/Darwin.mk     Wed Oct 13 15:31:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
+# $NetBSD: Darwin.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -146,7 +146,7 @@
 _OPSYS_WHOLE_ARCHIVE_FLAG=     -Wl,--whole-archive
 _OPSYS_NO_WHOLE_ARCHIVE_FLAG=  -Wl,--no-whole-archive
 
-.if !defined(DEBUG_FLAGS)
+.if (!defined(INSTALL_UNSTRIPPED) || empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) && !defined(DEBUG_FLAGS)
 _STRIPFLAG_CC?=                -Wl,-x  # cc(1) option to strip
 _STRIPFLAG_INSTALL?=   -s      # install(1) option to strip
 .endif
diff -r 50ba18045e1a -r 14759e55a9b4 mk/platform/FreeBSD.mk
--- a/mk/platform/FreeBSD.mk    Wed Oct 13 15:24:44 2004 +0000
+++ b/mk/platform/FreeBSD.mk    Wed Oct 13 15:31:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: FreeBSD.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
+# $NetBSD: FreeBSD.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
@@ -153,7 +153,7 @@
 _OPSYS_WHOLE_ARCHIVE_FLAG=     -Wl,--whole-archive
 _OPSYS_NO_WHOLE_ARCHIVE_FLAG=  -Wl,--no-whole-archive
 
-.if !defined(DEBUG_FLAGS)
+.if (!defined(INSTALL_UNSTRIPPED) || empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) && !defined(DEBUG_FLAGS)
 _STRIPFLAG_CC?=                -s      # cc(1) option to strip
 _STRIPFLAG_INSTALL?=   -s      # install(1) option to strip
 .endif
diff -r 50ba18045e1a -r 14759e55a9b4 mk/platform/IRIX.mk
--- a/mk/platform/IRIX.mk       Wed Oct 13 15:24:44 2004 +0000
+++ b/mk/platform/IRIX.mk       Wed Oct 13 15:31:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
+# $NetBSD: IRIX.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -154,7 +154,7 @@
 # incompatible.
 _INCOMPAT_ICONV=       IRIX-*-*
 
-.if !defined(DEBUG_FLAGS)
+.if (!defined(INSTALL_UNSTRIPPED) || empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) && !defined(DEBUG_FLAGS)
 _STRIPFLAG_CC?=                -s      # cc(1) option to strip
 _STRIPFLAG_INSTALL?=   -s      # install(1) option to strip
 .endif
diff -r 50ba18045e1a -r 14759e55a9b4 mk/platform/Interix.mk
--- a/mk/platform/Interix.mk    Wed Oct 13 15:24:44 2004 +0000
+++ b/mk/platform/Interix.mk    Wed Oct 13 15:31:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.5 2004/10/12 04:41:39 tv Exp $
+# $NetBSD: Interix.mk,v 1.6 2004/10/13 15:31:31 tv Exp $
 #
 # Variable definitions for the Interix operating system.
 
@@ -155,7 +155,7 @@
 _OPSYS_WHOLE_ARCHIVE_FLAG=     -Wl,--whole-archive
 _OPSYS_NO_WHOLE_ARCHIVE_FLAG=  -Wl,--no-whole-archive
 
-.if !defined(DEBUG_FLAGS)
+.if (!defined(INSTALL_UNSTRIPPED) || empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) && !defined(DEBUG_FLAGS)
 _STRIPFLAG_CC?=                -s      # cc(1) option to strip
 _STRIPFLAG_INSTALL?=   -s      # install(1) option to strip
 .endif
diff -r 50ba18045e1a -r 14759e55a9b4 mk/platform/Linux.mk
--- a/mk/platform/Linux.mk      Wed Oct 13 15:24:44 2004 +0000
+++ b/mk/platform/Linux.mk      Wed Oct 13 15:31:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
+# $NetBSD: Linux.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -185,7 +185,7 @@
 _OPSYS_WHOLE_ARCHIVE_FLAG=     -Wl,--whole-archive
 _OPSYS_NO_WHOLE_ARCHIVE_FLAG=  -Wl,--no-whole-archive
 
-.if !defined(DEBUG_FLAGS)
+.if (!defined(INSTALL_UNSTRIPPED) || empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) && !defined(DEBUG_FLAGS)
 _STRIPFLAG_CC?=                -s      # cc(1) option to strip
 _STRIPFLAG_INSTALL?=   -s      # install(1) option to strip
 .endif
diff -r 50ba18045e1a -r 14759e55a9b4 mk/platform/NetBSD.mk
--- a/mk/platform/NetBSD.mk     Wed Oct 13 15:24:44 2004 +0000
+++ b/mk/platform/NetBSD.mk     Wed Oct 13 15:31:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
+# $NetBSD: NetBSD.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -157,7 +157,7 @@
 LINK_ALL_LIBGCC_HACK=  -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
 .endif
 
-.if !defined(DEBUG_FLAGS)
+.if (!defined(INSTALL_UNSTRIPPED) || empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) && !defined(DEBUG_FLAGS)
 _STRIPFLAG_CC?=                -s      # cc(1) option to strip
 _STRIPFLAG_INSTALL?=   -s      # install(1) option to strip
 .endif
diff -r 50ba18045e1a -r 14759e55a9b4 mk/platform/OpenBSD.mk
--- a/mk/platform/OpenBSD.mk    Wed Oct 13 15:24:44 2004 +0000
+++ b/mk/platform/OpenBSD.mk    Wed Oct 13 15:31:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: OpenBSD.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
+# $NetBSD: OpenBSD.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
@@ -145,7 +145,7 @@
 _OPSYS_WHOLE_ARCHIVE_FLAG=     -Wl,--whole-archive
 _OPSYS_NO_WHOLE_ARCHIVE_FLAG=  -Wl,--no-whole-archive
 
-.if !defined(DEBUG_FLAGS)
+.if (!defined(INSTALL_UNSTRIPPED) || empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) && !defined(DEBUG_FLAGS)
 _STRIPFLAG_CC?=                -s      # cc(1) option to strip
 _STRIPFLAG_INSTALL?=   -s      # install(1) option to strip
 .endif
diff -r 50ba18045e1a -r 14759e55a9b4 mk/platform/SunOS.mk
--- a/mk/platform/SunOS.mk      Wed Oct 13 15:24:44 2004 +0000
+++ b/mk/platform/SunOS.mk      Wed Oct 13 15:31:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.3 2004/10/12 08:38:19 uebayasi Exp $
+# $NetBSD: SunOS.mk,v 1.4 2004/10/13 15:31:31 tv Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -145,7 +145,7 @@
 # incompatible.
 _INCOMPAT_ICONV=       SunOS-*-*
 
-.if !defined(DEBUG_FLAGS)
+.if (!defined(INSTALL_UNSTRIPPED) || empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) && !defined(DEBUG_FLAGS)
 _STRIPFLAG_CC?=                -s      # cc(1) option to strip
 _STRIPFLAG_INSTALL?=   -s      # install(1) option to strip
 .endif
diff -r 50ba18045e1a -r 14759e55a9b4 mk/platform/UnixWare.mk
--- a/mk/platform/UnixWare.mk   Wed Oct 13 15:24:44 2004 +0000
+++ b/mk/platform/UnixWare.mk   Wed Oct 13 15:31:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: UnixWare.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
+# $NetBSD: UnixWare.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
 #
 # Variable definitions for the UnixWare 7 operating system.
 
@@ -148,7 +148,7 @@
 _INCOMPAT_ICONV=       UnixWare-*-*
 
 # XXX Where are those variables used?
-.if !defined(DEBUG_FLAGS)
+.if (!defined(INSTALL_UNSTRIPPED) || empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) && !defined(DEBUG_FLAGS)
 _STRIPFLAG_CC?=                        # cc(1) option to strip
 _STRIPFLAG_INSTALL?=           # install(1) option to strip
 .endif