summaryrefslogtreecommitdiffstats
path: root/support/scripts
diff options
context:
space:
mode:
authorArnout Vandecappelle <arnout@mind.be>2014-06-23 22:11:23 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-06-29 10:43:37 +0200
commitb82f66cf404ef74509212de0d035737c75c5e6d6 (patch)
tree822541677507559af601b1d3a94d7927bb6c5b25 /support/scripts
parentfa9f824c3824ef41f6c377297f8bfe9a7b763ca6 (diff)
downloadbuildroot-b82f66cf404ef74509212de0d035737c75c5e6d6.tar.gz
buildroot-b82f66cf404ef74509212de0d035737c75c5e6d6.zip
graph-depends: support calling from recursive make
The graph-depends script calls make. If the outer make was called recursively, or if it was called with '-C <somedir>', then the environment will contain "MAKEFLAGS=w --". Therefore, the recursive make prints 'Entering' and 'Leaving' messages, which clobbers the output for dot. To avoid this, add "--no-print-directory" to the recursive make arguments. Since we require GNU make 3.81, we can be sure that this option is available. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'support/scripts')
-rwxr-xr-xsupport/scripts/graph-depends4
1 files changed, 2 insertions, 2 deletions
diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends
index 58401a2fa1..52c16ceae3 100755
--- a/support/scripts/graph-depends
+++ b/support/scripts/graph-depends
@@ -81,7 +81,7 @@ allpkgs = []
# list is used as the starting point for full dependency graphs
def get_targets():
sys.stderr.write("Getting targets\n")
- cmd = ["make", "-s", "show-targets"]
+ cmd = ["make", "-s", "--no-print-directory", "show-targets"]
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
output = p.communicate()[0].strip()
if p.returncode != 0:
@@ -95,7 +95,7 @@ def get_targets():
# dependencies formatted as a Python dictionary.
def get_depends(pkgs):
sys.stderr.write("Getting dependencies for %s\n" % pkgs)
- cmd = ["make", "-s" ]
+ cmd = ["make", "-s", "--no-print-directory" ]
for pkg in pkgs:
cmd.append("%s-show-depends" % pkg)
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
OpenPOWER on IntegriCloud