summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2019-05-01 09:50:04 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-05-01 10:37:34 +0200
commita00475fbd3f865c6eaca60bd946a41a0617fa9ea (patch)
tree20f76e2cb08f3dcb126b33b3c22f44a88a98b87e
parentc9d93cbff60035373d8af8b88f6aa3e160e15489 (diff)
downloadptxdist-a00475fbd3f865c6eaca60bd946a41a0617fa9ea.tar.gz
ptxdist-a00475fbd3f865c6eaca60bd946a41a0617fa9ea.tar.xz
ninja: allow building with '-v'
Without this, configure.py closes all fds including fd 9 which is used by the wrapper to log the commandline. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/ninja-1.8.2/0007-don-t-close-open-fds.patch30
-rw-r--r--patches/ninja-1.8.2/series3
2 files changed, 32 insertions, 1 deletions
diff --git a/patches/ninja-1.8.2/0007-don-t-close-open-fds.patch b/patches/ninja-1.8.2/0007-don-t-close-open-fds.patch
new file mode 100644
index 000000000..8da54d4bd
--- /dev/null
+++ b/patches/ninja-1.8.2/0007-don-t-close-open-fds.patch
@@ -0,0 +1,30 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 29 Apr 2019 11:16:17 +0200
+Subject: [PATCH] don't close open fds
+
+PTXdist uses fd 9 to write debug information to the logfile.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.py b/configure.py
+index 41d95469c00d..d5e34a0eeb3a 100755
+--- a/configure.py
++++ b/configure.py
+@@ -186,7 +186,7 @@ class Bootstrap:
+ try:
+ if self.verbose:
+ print(cmdline)
+- subprocess.check_call(cmdline, shell=True)
++ subprocess.check_call(cmdline, shell=True, close_fds=False)
+ except subprocess.CalledProcessError:
+ print('when running: ', cmdline)
+ raise
+@@ -683,4 +683,4 @@ if options.bootstrap:
+ if options.verbose:
+ rebuild_args.append('-v')
+
+- subprocess.check_call(rebuild_args)
++ subprocess.check_call(rebuild_args, close_fds=False)
diff --git a/patches/ninja-1.8.2/series b/patches/ninja-1.8.2/series
index 4494b5b79..ef13f1510 100644
--- a/patches/ninja-1.8.2/series
+++ b/patches/ninja-1.8.2/series
@@ -6,4 +6,5 @@
0004-Honor-lN-from-MAKEFLAGS.patch
0005-Use-LinePrinter-for-TokenPool-messages.patch
0006-Prepare-PR-for-merging.patch
-# d3f8b2e9621f8f2490c54704a2621fb2 - git-ptx-patches magic
+0007-don-t-close-open-fds.patch
+# e4c44c2e231b79ea6c0263de5d69c6d3 - git-ptx-patches magic