pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Replaced _PKG_SILENT and _PKG_DEBUG with RUN.
details: https://anonhg.NetBSD.org/pkgsrc/rev/067b2b0f1b31
branches: trunk
changeset: 538425:067b2b0f1b31
user: rillig <rillig%pkgsrc.org@localhost>
date: Thu Feb 07 21:36:13 2008 +0000
description:
Replaced _PKG_SILENT and _PKG_DEBUG with RUN.
diffstat:
mk/bsd.pkg.barrier.mk | 8 +++---
mk/bsd.pkg.debug.mk | 8 +++---
mk/bsd.pkg.error.mk | 10 ++++----
mk/bsd.pkg.mk | 10 ++++----
mk/bsd.pkg.readme.mk | 4 +-
mk/bsd.pkg.update.mk | 6 ++--
mk/build/bsd.build.mk | 8 +++---
mk/build/build.mk | 6 ++--
mk/build/test.mk | 10 ++++----
mk/buildlink3/bsd.buildlink3.mk | 44 ++++++++++++++++++------------------
mk/bulk/bsd.bulk-pkg.mk | 4 +-
mk/check/check-files.mk | 40 ++++++++++++++++----------------
mk/check/check-shlibs.mk | 8 +++---
mk/check/check-wrkref.mk | 4 +-
mk/compiler.mk | 8 +++---
mk/configure/cmake.mk | 8 ++----
mk/configure/config-override.mk | 6 ++--
mk/configure/configure.mk | 8 +++---
mk/configure/gnu-configure.mk | 6 ++--
mk/configure/install-sh-override.mk | 6 ++--
mk/configure/libtool-override.mk | 10 ++++----
mk/configure/replace-interpreter.mk | 4 +-
mk/depends/bsd.depends.mk | 12 +++++-----
mk/djbware.mk | 4 +-
24 files changed, 120 insertions(+), 122 deletions(-)
diffs (truncated from 882 to 300 lines):
diff -r 0d848a312223 -r 067b2b0f1b31 mk/bsd.pkg.barrier.mk
--- a/mk/bsd.pkg.barrier.mk Thu Feb 07 21:28:29 2008 +0000
+++ b/mk/bsd.pkg.barrier.mk Thu Feb 07 21:36:13 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.barrier.mk,v 1.15 2007/11/30 18:54:40 rillig Exp $
+# $NetBSD: bsd.pkg.barrier.mk,v 1.16 2008/02/07 21:36:13 rillig Exp $
_COOKIE.barrier= ${WRKDIR}/.barrier_cookie
@@ -63,7 +63,7 @@
. if defined(PKG_VERBOSE)
@${PHASE_MSG} "Invoking \`\`"${_BARRIER_CMDLINE_TARGETS:Q}"'' after barrier for ${PKGNAME}"
. endif
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
cd ${.CURDIR} \
&& ${RECURSIVE_MAKE} ${MAKEFLAGS} _PKGSRC_BARRIER=yes ALLOW_VULNERABLE_PACKAGES= ${_BARRIER_CMDLINE_TARGETS} \
|| { \
@@ -82,5 +82,5 @@
### barrier-cookie creates the "barrier" cookie file.
###
${_COOKIE.barrier}:
- ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
- ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${.TARGET}
+ ${RUN}${MKDIR} ${.TARGET:H}
+ ${RUN}${ECHO} ${PKGNAME} > ${.TARGET}
diff -r 0d848a312223 -r 067b2b0f1b31 mk/bsd.pkg.debug.mk
--- a/mk/bsd.pkg.debug.mk Thu Feb 07 21:28:29 2008 +0000
+++ b/mk/bsd.pkg.debug.mk Thu Feb 07 21:36:13 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.debug.mk,v 1.20 2007/09/27 12:49:14 rillig Exp $
+# $NetBSD: bsd.pkg.debug.mk,v 1.21 2008/02/07 21:36:13 rillig Exp $
#
# Public targets:
#
@@ -42,7 +42,7 @@
_show-dbginfo-file-versions:
@${PRINTF} "File versions:\\n"
- ${_PKG_SILENT}${_PKG_DEBUG} set -e; \
+ ${RUN} \
sedexpr='s,^.*\([$$]NetBSD:[^$$]*\$$\).*,\1,p'; \
${FIND} * -type f -print \
| while read fname; do \
@@ -73,7 +73,7 @@
_show-dbginfo-config.status:
.if !empty(CONFIGURE_DIRS:M*)
- ${_PKG_SILENT}${_PKG_DEBUG} set -e; \
+ ${RUN} \
if ${TEST} -d ${WRKSRC:Q}; then cd ${WRKSRC:Q}; \
for cs in ${CONFIGURE_DIRS:=/config.status}; do \
if ${TEST} ! -f "$${cs}"; then continue; fi; \
@@ -97,7 +97,7 @@
_show-dbginfo-config.h:
.if !empty(CONFIGURE_DIRS:M*)
- ${_PKG_SILENT}${_PKG_DEBUG} set -e; \
+ ${RUN} \
[ -d ${WRKSRC} ] || exit 0; \
print_config_h() { \
printf "%s:\\n" "`pwd`/$$1"; \
diff -r 0d848a312223 -r 067b2b0f1b31 mk/bsd.pkg.error.mk
--- a/mk/bsd.pkg.error.mk Thu Feb 07 21:28:29 2008 +0000
+++ b/mk/bsd.pkg.error.mk Thu Feb 07 21:36:13 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.error.mk,v 1.3 2006/10/06 19:05:43 rillig Exp $
+# $NetBSD: bsd.pkg.error.mk,v 1.4 2008/02/07 21:36:13 rillig Exp $
ERROR_DIR= ${WRKDIR}/.error
WARNING_DIR= ${WRKDIR}/.warning
@@ -14,7 +14,7 @@
makedirs: ${ERROR_DIR} ${WARNING_DIR} ${_ERROR_DONE_DIR} ${_WARNING_DONE_DIR}
${ERROR_DIR} ${WARNING_DIR} ${_ERROR_DONE_DIR} ${_WARNING_DONE_DIR}:
- ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET}
+ ${RUN}${MKDIR} ${.TARGET}
.PHONY: error-check
@@ -28,7 +28,7 @@
### directory, then the target will fail.
###
error-check: .USE
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
${RM} -f ${WARNING_DIR}/*.tmp; \
${TEST} -d ${WARNING_DIR} || exit 0; \
cd ${WARNING_DIR}; \
@@ -39,7 +39,7 @@
${CAT} ./* | ${WARNING_CAT}; \
${MV} -f ./* ${_WARNING_DONE_DIR}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
${RM} -f ${ERROR_DIR}/*.tmp; \
${TEST} -d ${ERROR_DIR} || exit 0; \
cd ${ERROR_DIR}; \
@@ -59,4 +59,4 @@
### error-clean removes the error and warning directory and files.
###
error-clean:
- ${_PKG_SILENT}${_PKG_DEBUG}${RM} -fr ${ERROR_DIR} ${WARNING_DIR}
+ ${RUN}${RM} -fr ${ERROR_DIR} ${WARNING_DIR}
diff -r 0d848a312223 -r 067b2b0f1b31 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk Thu Feb 07 21:28:29 2008 +0000
+++ b/mk/bsd.pkg.mk Thu Feb 07 21:36:13 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1935 2008/01/16 01:01:26 joerg Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1936 2008/02/07 21:36:13 rillig Exp $
#
# This file is in the public domain.
#
@@ -805,14 +805,14 @@
#
.for _phase_ in ${_ALL_PHASES}
${_MAKEVARS_MK.${_phase_}}: ${WRKDIR}
- ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${.TARGET}.tmp
+ ${RUN}${RM} -f ${.TARGET}.tmp
. for _var_ in ${MAKEVARS:O:u}
. if defined(${_var_})
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
${ECHO} ${_var_}"= "${${_var_}:Q} >> ${.TARGET}.tmp
. endif
. endfor
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
if ${TEST} -f ${.TARGET}.tmp; then \
( ${ECHO} ".if !defined(_MAKEVARS_MK)"; \
${ECHO} "_MAKEVARS_MK= defined"; \
@@ -823,7 +823,7 @@
) > ${.TARGET}; \
${RM} -f ${.TARGET}.tmp; \
fi
- ${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
+ ${RUN}${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
.endfor
.if make(pbulk-index) || make(pbulk-index-item) || make(pbulk-save-wrkdir)
diff -r 0d848a312223 -r 067b2b0f1b31 mk/bsd.pkg.readme.mk
--- a/mk/bsd.pkg.readme.mk Thu Feb 07 21:28:29 2008 +0000
+++ b/mk/bsd.pkg.readme.mk Thu Feb 07 21:36:13 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.readme.mk,v 1.16 2008/01/03 20:51:21 adrianp Exp $
+# $NetBSD: bsd.pkg.readme.mk,v 1.17 2008/02/07 21:36:13 rillig Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and encapsulates the
# code to produce README.html files in each package directory.
@@ -239,7 +239,7 @@
#
.PHONY: show-vulnerabilities-html
show-vulnerabilities-html:
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
if ${PKG_ADMIN} pmatch 'pkg_install<20070714' pkg_install-${PKGTOOLS_VERSION}; then \
if [ -f ${PKGVULNDIR}/pkg-vulnerabilities ]; then \
${AWK} '/^${PKGBASE}[-<>=]+[0-9]/ { gsub("\<", "\\<", $$1); \
diff -r 0d848a312223 -r 067b2b0f1b31 mk/bsd.pkg.update.mk
--- a/mk/bsd.pkg.update.mk Thu Feb 07 21:28:29 2008 +0000
+++ b/mk/bsd.pkg.update.mk Thu Feb 07 21:36:13 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.update.mk,v 1.13 2007/09/07 16:47:05 rillig Exp $
+# $NetBSD: bsd.pkg.update.mk,v 1.14 2008/02/07 21:36:13 rillig Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and contains the targets
# and variables for "make update".
@@ -60,7 +60,7 @@
. endif
.endif
${RUN} ${RECURSIVE_MAKE} ${MAKEFLAGS} ${UPDATE_TARGET} KEEP_WRKDIR=YES DEPENDS_TARGET=${DEPENDS_TARGET:Q}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
[ ! -s ${_DDIR} ] || for dep in `${CAT} ${_DDIR}` ; do \
(if cd ../.. && cd "$${dep}" ; then \
${PHASE_MSG} "Installing in $${dep}" && \
@@ -83,7 +83,7 @@
.PHONY: clean-update
clean-update:
${RUN} ${RECURSIVE_MAKE} ${MAKEFLAGS} update-create-ddir
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
if [ -s ${_DDIR} ] ; then \
for dep in `${CAT} ${_DDIR}` ; do \
(if cd ../.. && cd "$${dep}" ; then \
diff -r 0d848a312223 -r 067b2b0f1b31 mk/build/bsd.build.mk
--- a/mk/build/bsd.build.mk Thu Feb 07 21:28:29 2008 +0000
+++ b/mk/build/bsd.build.mk Thu Feb 07 21:36:13 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.build.mk,v 1.10 2008/01/04 01:46:26 rillig Exp $
+# $NetBSD: bsd.build.mk,v 1.11 2008/02/07 21:36:13 rillig Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and provides all
# variables and targets related to building sources for a package.
@@ -51,6 +51,6 @@
###
.PHONY: build-cookie
build-cookie:
- ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.build} || ${FALSE}
- ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.build:H}
- ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_COOKIE.build}
+ ${RUN}${TEST} ! -f ${_COOKIE.build} || ${FALSE}
+ ${RUN}${MKDIR} ${_COOKIE.build:H}
+ ${RUN}${ECHO} ${PKGNAME} > ${_COOKIE.build}
diff -r 0d848a312223 -r 067b2b0f1b31 mk/build/build.mk
--- a/mk/build/build.mk Thu Feb 07 21:28:29 2008 +0000
+++ b/mk/build/build.mk Thu Feb 07 21:36:13 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: build.mk,v 1.15 2007/12/01 11:11:54 rillig Exp $
+# $NetBSD: build.mk,v 1.16 2008/02/07 21:36:13 rillig Exp $
#
# This file defines what happens in the build phase, excluding the
# self-test, which is defined in test.mk.
@@ -141,7 +141,7 @@
.if !target(do-build)
do-build:
. for _dir_ in ${BUILD_DIRS}
- ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD} \
+ ${RUN}${_ULIMIT_CMD} \
cd ${WRKSRC} && cd ${_dir_} && \
${BUILD_MAKE_CMD} ${BUILD_TARGET}
. endfor
@@ -161,7 +161,7 @@
.if defined(_PKGSRC_BARRIER)
build-env: .PHONY configure
@${STEP_MSG} "Entering the build environment for ${PKGNAME}"
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${BUILD_ENV_SHELL}
.else
build-env: barrier
diff -r 0d848a312223 -r 067b2b0f1b31 mk/build/test.mk
--- a/mk/build/test.mk Thu Feb 07 21:28:29 2008 +0000
+++ b/mk/build/test.mk Thu Feb 07 21:36:13 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: test.mk,v 1.13 2007/12/01 11:11:54 rillig Exp $
+# $NetBSD: test.mk,v 1.14 2008/02/07 21:36:13 rillig Exp $
#
# After the "build" phase, many packages provide some sort of self-test
# that can be run on the not-yet installed package. To enable these
@@ -129,7 +129,7 @@
. if defined(TEST_TARGET) && !empty(TEST_TARGET)
do-test:
. for _dir_ in ${TEST_DIRS}
- ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD} \
+ ${RUN}${_ULIMIT_CMD} \
cd ${WRKSRC} && cd ${_dir_} && \
${TEST_MAKE_CMD} ${TEST_TARGET}
. endfor
@@ -156,6 +156,6 @@
###
.PHONY: test-cookie
test-cookie:
- ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.test} || ${FALSE}
- ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.test:H}
- ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_COOKIE.test}
+ ${RUN}${TEST} ! -f ${_COOKIE.test} || ${FALSE}
+ ${RUN}${MKDIR} ${_COOKIE.test:H}
+ ${RUN}${ECHO} ${PKGNAME} > ${_COOKIE.test}
diff -r 0d848a312223 -r 067b2b0f1b31 mk/buildlink3/bsd.buildlink3.mk
--- a/mk/buildlink3/bsd.buildlink3.mk Thu Feb 07 21:28:29 2008 +0000
+++ b/mk/buildlink3/bsd.buildlink3.mk Thu Feb 07 21:36:13 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.199 2007/12/05 21:36:43 tron Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.200 2008/02/07 21:36:13 rillig Exp $
#
# Copyright (c) 2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -497,14 +497,14 @@
.PHONY: buildlink-directories
do-buildlink: buildlink-directories
buildlink-directories:
- ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${BUILDLINK_DIR}
- ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${BUILDLINK_BINDIR}
+ ${RUN}${MKDIR} ${BUILDLINK_DIR}
+ ${RUN}${MKDIR} ${BUILDLINK_BINDIR}
.if defined(USE_X11) && ${X11_TYPE} != "modular"
- ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${BUILDLINK_X11_DIR}
- ${_PKG_SILENT}${_PKG_DEBUG}${LN} -sf ${BUILDLINK_DIR} ${BUILDLINK_X11_DIR}
+ ${RUN}${RM} -f ${BUILDLINK_X11_DIR}
+ ${RUN}${LN} -sf ${BUILDLINK_DIR} ${BUILDLINK_X11_DIR}
.endif
- ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${BUILDLINK_DIR}/include
- ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${BUILDLINK_DIR}/lib${LIBABISUFFIX}
+ ${RUN}${MKDIR} ${BUILDLINK_DIR}/include
+ ${RUN}${MKDIR} ${BUILDLINK_DIR}/lib${LIBABISUFFIX}
# The following variables are all optionally defined and control which
# package files are symlinked into ${BUILDLINK_DIR} and how their names
@@ -546,12 +546,12 @@
.PHONY: buildlink-${_pkg_}-message
buildlink-${_pkg_}-message:
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
${ECHO_BUILDLINK_MSG} "=> Linking ${_pkg_} files into ${BUILDLINK_DIR}."
.PHONY: buildlink-${_pkg_}-cookie
buildlink-${_pkg_}-cookie:
- ${_PKG_SILENT}${_PKG_DEBUG} \
Home |
Main Index |
Thread Index |
Old Index