pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk/compiler Replaced _PKG_SILENT and _PKG_DEBUG with RUN.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d41d8de947b9
branches:  trunk
changeset: 538420:d41d8de947b9
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Feb 07 20:59:05 2008 +0000

description:
Replaced _PKG_SILENT and _PKG_DEBUG with RUN.

XXX: Why do we have the exactly same code in all the files?

diffstat:

 mk/compiler/ccache.mk  |   8 ++++----
 mk/compiler/ccc.mk     |  10 +++++-----
 mk/compiler/distcc.mk  |   8 ++++----
 mk/compiler/f2c.mk     |   8 ++++----
 mk/compiler/gcc.mk     |  14 +++++++-------
 mk/compiler/hp.mk      |  10 +++++-----
 mk/compiler/icc.mk     |  10 +++++-----
 mk/compiler/ido.mk     |  10 +++++-----
 mk/compiler/mipspro.mk |  10 +++++-----
 mk/compiler/xlc.mk     |  10 +++++-----
 10 files changed, 49 insertions(+), 49 deletions(-)

diffs (275 lines):

diff -r 41d80191a701 -r d41d8de947b9 mk/compiler/ccache.mk
--- a/mk/compiler/ccache.mk     Thu Feb 07 20:54:25 2008 +0000
+++ b/mk/compiler/ccache.mk     Thu Feb 07 20:59:05 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ccache.mk,v 1.30 2007/10/16 09:33:29 rillig Exp $
+# $NetBSD: ccache.mk,v 1.31 2008/02/07 20:59:05 rillig Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -129,11 +129,11 @@
 .    if !target(${_CCACHE_${_var_}})
 override-tools: ${_CCACHE_${_var_}}
 ${_CCACHE_${_var_}}:
-       ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       ${RUN}${MKDIR} ${.TARGET:H}
+       ${RUN}                                  \
        ${LN} -fs ${CCACHE_BASE}/bin/ccache ${.TARGET}
 .      for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       ${RUN}                                  \
        if [ ! -x "${_alias_}" ]; then                                  \
                ${LN} -fs ${CCACHE_BASE}/bin/ccache ${_alias_};         \
        fi
diff -r 41d80191a701 -r d41d8de947b9 mk/compiler/ccc.mk
--- a/mk/compiler/ccc.mk        Thu Feb 07 20:54:25 2008 +0000
+++ b/mk/compiler/ccc.mk        Thu Feb 07 20:59:05 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ccc.mk,v 1.16 2007/03/15 22:33:42 rillig Exp $
+# $NetBSD: ccc.mk,v 1.17 2008/02/07 20:59:05 rillig Exp $
 #
 # This is the compiler definition for the Compaq C Compilers.
 #
@@ -69,14 +69,14 @@
 .  if !target(${_CCC_${_var_}})
 override-tools: ${_CCC_${_var_}}
 ${_CCC_${_var_}}:
-       ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       ${RUN}${MKDIR} ${.TARGET:H}
+       ${RUN}                                  \
        (${ECHO} '#!${TOOLS_SHELL}';                                    \
         ${ECHO} 'exec /usr/bin/${.TARGET:T} "$$@"';                    \
        ) > ${.TARGET}
-       ${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
+       ${RUN}${CHMOD} +x ${.TARGET}
 .    for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       ${RUN}                                  \
        if [ ! -x "${_alias_}" ]; then                                  \
                ${LN} -f ${.TARGET} ${_alias_};                         \
        fi
diff -r 41d80191a701 -r d41d8de947b9 mk/compiler/distcc.mk
--- a/mk/compiler/distcc.mk     Thu Feb 07 20:54:25 2008 +0000
+++ b/mk/compiler/distcc.mk     Thu Feb 07 20:59:05 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: distcc.mk,v 1.29 2006/12/15 12:46:24 martti Exp $
+# $NetBSD: distcc.mk,v 1.30 2008/02/07 20:59:05 rillig Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -110,11 +110,11 @@
 .    if !target(${_DISTCC_${_var_}})
 override-tools: ${_DISTCC_${_var_}}
 ${_DISTCC_${_var_}}:
-       ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       ${RUN}${MKDIR} ${.TARGET:H}
+       ${RUN}                                  \
        ${LN} -fs ${_DISTCCBASE}/bin/distcc ${.TARGET}
 .      for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       ${RUN}                                  \
        if [ ! -x "${_alias_}" ]; then                                  \
                ${LN} -fs ${_DISTCCBASE}/bin/distcc ${_alias_};         \
        fi
diff -r 41d80191a701 -r d41d8de947b9 mk/compiler/f2c.mk
--- a/mk/compiler/f2c.mk        Thu Feb 07 20:54:25 2008 +0000
+++ b/mk/compiler/f2c.mk        Thu Feb 07 20:59:05 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: f2c.mk,v 1.9 2007/01/16 17:16:20 dmcmahill Exp $
+# $NetBSD: f2c.mk,v 1.10 2008/02/07 20:59:05 rillig Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -109,11 +109,11 @@
 .    if !target(${_F2C_${_var_}})
 override-tools: ${_F2C_${_var_}}
 ${_F2C_${_var_}}:
-       ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       ${RUN}${MKDIR} ${.TARGET:H}
+       ${RUN}                                  \
        ${LN} -fs ${_F2CBASE}/bin/f2c-f77 ${.TARGET}
 .      for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       ${RUN}                                  \
        if [ ! -x "${_alias_}" ]; then                                  \
                ${LN} -fs ${_F2CBASE}/bin/f2c-f77 ${_alias_};           \
        fi
diff -r 41d80191a701 -r d41d8de947b9 mk/compiler/gcc.mk
--- a/mk/compiler/gcc.mk        Thu Feb 07 20:54:25 2008 +0000
+++ b/mk/compiler/gcc.mk        Thu Feb 07 20:59:05 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.92 2007/08/11 17:31:22 joerg Exp $
+# $NetBSD: gcc.mk,v 1.93 2008/02/07 20:59:05 rillig Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -433,19 +433,19 @@
 .  if !target(${_GCC_${_var_}})
 override-tools: ${_GCC_${_var_}}
 ${_GCC_${_var_}}:
-       ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
+       ${RUN}${MKDIR} ${.TARGET:H}
 .    if !empty(GCC_USE_SYMLINKS:Myes)
-       ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${.TARGET}
-       ${_PKG_SILENT}${_PKG_DEBUG}${LN} -s ${_GCCBINDIR}/${.TARGET:T} ${.TARGET}
+       ${RUN}${RM} -f ${.TARGET}
+       ${RUN}${LN} -s ${_GCCBINDIR}/${.TARGET:T} ${.TARGET}
 .    else
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       ${RUN}                                  \
        (${ECHO} '#!${TOOLS_SHELL}';                                    \
         ${ECHO} 'exec ${_GCCBINDIR}/${.TARGET:T} "$$@"';               \
        ) > ${.TARGET}
-       ${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
+       ${RUN}${CHMOD} +x ${.TARGET}
 .    endif
 .    for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       ${RUN}                                  \
        if [ ! -x "${_alias_}" ]; then                                  \
                ${LN} -f -s ${.TARGET:T} ${_alias_};                    \
        fi
diff -r 41d80191a701 -r d41d8de947b9 mk/compiler/hp.mk
--- a/mk/compiler/hp.mk Thu Feb 07 20:54:25 2008 +0000
+++ b/mk/compiler/hp.mk Thu Feb 07 20:59:05 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: hp.mk,v 1.4 2008/01/15 10:08:18 tnn Exp $
+# $NetBSD: hp.mk,v 1.5 2008/02/07 20:59:05 rillig Exp $
 #
 # This is the compiler definition for the HP-UX C/aC++ compilers.
 #
@@ -71,14 +71,14 @@
 .  if !target(${_HP_${_var_}})
 override-tools: ${_HP_${_var_}}
 ${_HP_${_var_}}:
-       ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       ${RUN}${MKDIR} ${.TARGET:H}
+       ${RUN}                                  \
        (${ECHO} '#!${TOOLS_SHELL}';                                    \
         ${ECHO} 'exec ${${_var_}PATH} "$$@"';                  \
        ) > ${.TARGET}
-       ${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
+       ${RUN}${CHMOD} +x ${.TARGET}
 .    for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       ${RUN}                                  \
        if [ ! -x "${_alias_}" ]; then                                  \
                ${LN} -f ${.TARGET} ${_alias_};                         \
        fi
diff -r 41d80191a701 -r d41d8de947b9 mk/compiler/icc.mk
--- a/mk/compiler/icc.mk        Thu Feb 07 20:54:25 2008 +0000
+++ b/mk/compiler/icc.mk        Thu Feb 07 20:59:05 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: icc.mk,v 1.4 2006/12/15 12:46:24 martti Exp $
+# $NetBSD: icc.mk,v 1.5 2008/02/07 20:59:05 rillig Exp $
 #
 # This is the compiler definition for the Intel compilers.
 #
@@ -80,14 +80,14 @@
 .  if !target(${_ICC_${_var_}})
 override-tools: ${_ICC_${_var_}}
 ${_ICC_${_var_}}:
-       ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       ${RUN}${MKDIR} ${.TARGET:H}
+       ${RUN}                                  \
        (${ECHO} '#!${TOOLS_SHELL}';                                    \
         ${ECHO} 'exec ${ICCBASE}/bin/${.TARGET:T} "$$@"';              \
        ) > ${.TARGET}
-       ${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
+       ${RUN}${CHMOD} +x ${.TARGET}
 .    for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       ${RUN}                                  \
        if [ ! -x "${_alias_}" ]; then                                  \
                ${LN} -f ${.TARGET} ${_alias_};                         \
        fi
diff -r 41d80191a701 -r d41d8de947b9 mk/compiler/ido.mk
--- a/mk/compiler/ido.mk        Thu Feb 07 20:54:25 2008 +0000
+++ b/mk/compiler/ido.mk        Thu Feb 07 20:59:05 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ido.mk,v 1.5 2006/12/15 12:46:24 martti Exp $
+# $NetBSD: ido.mk,v 1.6 2008/02/07 20:59:05 rillig Exp $
 #
 # This is the compiler definition for the SGI IRIS Development Option
 # cc (IRIX 5).
@@ -66,14 +66,14 @@
 .  if !target(${_IDO_${_var_}})
 override-tools: ${_IDO_${_var_}}
 ${_IDO_${_var_}}:
-       ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       ${RUN}${MKDIR} ${.TARGET:H}
+       ${RUN}                                  \
        (${ECHO} '#!${TOOLS_SHELL}';                                    \
         ${ECHO} 'exec ${${_var_}PATH} "$$@"';                  \
        ) > ${.TARGET}
-       ${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
+       ${RUN}${CHMOD} +x ${.TARGET}
 .    for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       ${RUN}                                  \
        if [ ! -x "${_alias_}" ]; then                                  \
                ${LN} -f ${.TARGET} ${_alias_};                         \
        fi
diff -r 41d80191a701 -r d41d8de947b9 mk/compiler/mipspro.mk
--- a/mk/compiler/mipspro.mk    Thu Feb 07 20:54:25 2008 +0000
+++ b/mk/compiler/mipspro.mk    Thu Feb 07 20:59:05 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mipspro.mk,v 1.38 2007/03/07 01:37:18 rillig Exp $
+# $NetBSD: mipspro.mk,v 1.39 2008/02/07 20:59:05 rillig Exp $
 #
 # This is the compiler definition for the MIPSpro C compiler.
 #
@@ -90,14 +90,14 @@
 .  if !target(${_MIPSPRO_${_var_}})
 override-tools: ${_MIPSPRO_${_var_}}
 ${_MIPSPRO_${_var_}}:
-       ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       ${RUN}${MKDIR} ${.TARGET:H}
+       ${RUN}                                  \
        (${ECHO} '#!${TOOLS_SHELL}';                                    \
         ${ECHO} 'exec ${MIPSPROBASE}/bin/${.TARGET:T} "$$@"';          \
        ) > ${.TARGET}
-       ${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
+       ${RUN}${CHMOD} +x ${.TARGET}
 .    for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       ${RUN}                                  \
        if [ ! -x "${_alias_}" ]; then                                  \
                ${LN} -f ${.TARGET} ${_alias_};                         \
        fi
diff -r 41d80191a701 -r d41d8de947b9 mk/compiler/xlc.mk
--- a/mk/compiler/xlc.mk        Thu Feb 07 20:54:25 2008 +0000
+++ b/mk/compiler/xlc.mk        Thu Feb 07 20:59:05 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: xlc.mk,v 1.16 2007/08/30 21:47:29 joerg Exp $
+# $NetBSD: xlc.mk,v 1.17 2008/02/07 20:59:05 rillig Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -116,14 +116,14 @@
 .  if !target(${_XLC_${_var_}})
 override-tools: ${_XLC_${_var_}}
 ${_XLC_${_var_}}:
-       ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       ${RUN}${MKDIR} ${.TARGET:H}
+       ${RUN}                                  \
        (${ECHO} '#!${TOOLS_SHELL}';                                    \
         ${ECHO} 'exec ${XLCBASE}/bin/${.TARGET:T} "$$@"';              \
        ) > ${.TARGET}
-       ${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
+       ${RUN}${CHMOD} +x ${.TARGET}
 .    for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       ${RUN}                                  \
        if [ ! -x "${_alias_}" ]; then                                  \
                ${LN} -f ${.TARGET} ${_alias_};                         \
        fi



Home | Main Index | Thread Index | Old Index