pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk/tools The wrapper for perl silently failed, giving ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/98e9bcbd1b00
branches:  trunk
changeset: 515869:98e9bcbd1b00
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Jul 10 08:13:37 2006 +0000

description:
The wrapper for perl silently failed, giving no hint that
USE_TOOLS+=perl was necessary. Therefore, added a new class of tools,
TOOLS_FAIL, which records the call in a .warnings file, which is later
printed to the user. At least when the tool is first called in the
"configure" phase; I didn't test other phases.

diffstat:

 mk/tools/create.mk |  10 +++++++++-
 mk/tools/perl.mk   |   4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diffs (49 lines):

diff -r 2e3160f9c2dd -r 98e9bcbd1b00 mk/tools/create.mk
--- a/mk/tools/create.mk        Mon Jul 10 07:59:02 2006 +0000
+++ b/mk/tools/create.mk        Mon Jul 10 08:13:37 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: create.mk,v 1.1 2006/06/06 06:30:29 jlam Exp $
+# $NetBSD: create.mk,v 1.2 2006/07/10 08:13:37 rillig Exp $
 #
 # Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -83,6 +83,9 @@
 #      script is invoked in place of the real tool.  This is used
 #      primarily to hide GNU auto* tools.
 #
+#    TOOLS_FAIL is a list of tools that return false and record their
+#      call in the .warning directory, which is later shown.
+#
 
 ######################################################################
 
@@ -96,6 +99,11 @@
 TOOLS_SCRIPT.${_t_}?=  exit 1
 .endfor
 
+.for _t_ in ${TOOLS_FAIL}
+TOOLS_CREATE+=         ${_t_}
+TOOLS_SCRIPT.${_t_}?=  ${DELAYED_WARNING_MSG} "Please add USE_TOOLS+=${_t_} to the package Makefile."; exit 1
+.endfor
+
 .for _t_ in ${TOOLS_GNU_MISSING}
 TOOLS_CREATE+=         ${_t_}
 TOOLS_PATH.${_t_}?=    ${PKGSRCDIR}/mk/gnu-config/missing
diff -r 2e3160f9c2dd -r 98e9bcbd1b00 mk/tools/perl.mk
--- a/mk/tools/perl.mk  Mon Jul 10 07:59:02 2006 +0000
+++ b/mk/tools/perl.mk  Mon Jul 10 08:13:37 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: perl.mk,v 1.20 2006/07/05 04:32:10 jlam Exp $
+# $NetBSD: perl.mk,v 1.21 2006/07/10 08:13:37 rillig Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -54,7 +54,7 @@
 # If a package doesn't explicitly say it uses perl, then create a "broken"
 # perl in the tools directory.
 #
-TOOLS_BROKEN+=         perl
+TOOLS_FAIL+=           perl
 TOOLS_PATH.perl=       ${TOOLS_CMD.perl}
 #
 # Some packages want the path to the perl tool, even if they don't have



Home | Main Index | Thread Index | Old Index