summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrillig <rillig>2006-07-10 08:13:37 +0000
committerrillig <rillig>2006-07-10 08:13:37 +0000
commit4a6f3fc3ab5b9ed3a7419e682ef7f73e15dba261 (patch)
treeb0e1760a5280665f2d2a3b7bedf91667143828ea
parentc869d3298b0d2a56cbaf65a5ffe0d669c64bab5d (diff)
downloadpkgsrc-4a6f3fc3ab5b9ed3a7419e682ef7f73e15dba261.tar.gz
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.
-rw-r--r--mk/tools/create.mk10
-rw-r--r--mk/tools/perl.mk4
2 files changed, 11 insertions, 3 deletions
diff --git a/mk/tools/create.mk b/mk/tools/create.mk
index f62e3e8d04b..0fd1a7b6204 100644
--- a/mk/tools/create.mk
+++ b/mk/tools/create.mk
@@ -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_CREATE+= ${_t_}
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 --git a/mk/tools/perl.mk b/mk/tools/perl.mk
index 16ee1ad988d..8423e9306e3 100644
--- a/mk/tools/perl.mk
+++ b/mk/tools/perl.mk
@@ -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