From: Fabio Porcedda <fabio.porcedda@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/2] Makefile: test if "dot" exists in "<pkg>-graph-depends"
Date: Tue, 17 Jun 2014 11:33:54 +0200 [thread overview]
Message-ID: <1402997634-2783-2-git-send-email-fabio.porcedda@gmail.com> (raw)
In-Reply-To: <1402997634-2783-1-git-send-email-fabio.porcedda@gmail.com>
To be able to check the "dot" command availability in
"<pkg>-graph-depends" move the check to the "graph-depends-requirements" rule.
Also don't use a subshell for the exit command to be sure that the error
will be returned by the shell.
Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Yann E. MORIN <yann.morin.1998@free.fr>
---
Notes:
v2:
- Remove the check for graph-build (Yann and Thomas)
- Remove the previuous code for checking the "dot"
command avaiability (Yann)
- Don't use a subshell (Yann)
Makefile | 6 ++++--
package/pkg-generic.mk | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 86acbbf..a27502b 100644
--- a/Makefile
+++ b/Makefile
@@ -669,9 +669,11 @@ graph-build: $(O)/build/build-time.log
--output=$(O)/graphs/build.pie-$(t).$(BR_GRAPH_OUT) \
$(if $(BR2_GRAPH_ALT),--alternate-colors)$(sep))
-graph-depends:
+graph-depends-requirements:
@dot -? >/dev/null 2>&1 || \
- (echo "ERROR: The 'dot' program from Graphviz is needed for graph-depends" >&2; exit 1)
+ { echo "ERROR: The 'dot' program from Graphviz is needed for graph-depends" >&2; exit 1; }
+
+graph-depends: graph-depends-requirements
@$(INSTALL) -d $(O)/graphs
@cd "$(CONFIG_DIR)"; \
$(TOPDIR)/support/scripts/graph-depends $(BR2_GRAPH_DEPS_OPTS) \
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 457d873..4a011cc 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -556,7 +556,7 @@ endif
$(1)-show-depends:
@echo $$($(2)_FINAL_DEPENDENCIES)
-$(1)-graph-depends:
+$(1)-graph-depends: graph-depends-requirements
@$$(INSTALL) -d $$(O)/graphs
@cd "$$(CONFIG_DIR)"; \
$$(TOPDIR)/support/scripts/graph-depends -p $(1) $$(BR2_GRAPH_DEPS_OPTS) \
--
2.0.0
next prev parent reply other threads:[~2014-06-17 9:33 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-17 9:33 [Buildroot] [PATCH 1/2] manual: add requirements for graph generation Fabio Porcedda
2014-06-17 9:33 ` Fabio Porcedda [this message]
2014-06-20 21:28 ` [Buildroot] [PATCH 2/2] Makefile: test if "dot" exists in "<pkg>-graph-depends" Yann E. MORIN
2014-06-22 17:25 ` Thomas Petazzoni
2014-06-20 21:21 ` [Buildroot] [PATCH 1/2] manual: add requirements for graph generation Yann E. MORIN
2014-06-22 17:15 ` Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1402997634-2783-2-git-send-email-fabio.porcedda@gmail.com \
--to=fabio.porcedda@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox