diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-05-01 10:37:00 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-05-01 10:37:34 +0200 |
| commit | 306bf8d353b56a58ede82b5b0ac77101d9bcfcbf (patch) | |
| tree | c4e73ed35ee0956fe315f2f896bce802fe402286 /patches | |
| parent | a00475fbd3f865c6eaca60bd946a41a0617fa9ea (diff) | |
| download | ptxdist-306bf8d353b56a58ede82b5b0ac77101d9bcfcbf.tar.gz ptxdist-306bf8d353b56a58ede82b5b0ac77101d9bcfcbf.tar.xz | |
host-meson: fix building with -v
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/meson-0.49.2/0004-Don-t-close-fds-when-executing-programs.patch | 23 | ||||
| -rw-r--r-- | patches/meson-0.49.2/series | 3 |
2 files changed, 25 insertions, 1 deletions
diff --git a/patches/meson-0.49.2/0004-Don-t-close-fds-when-executing-programs.patch b/patches/meson-0.49.2/0004-Don-t-close-fds-when-executing-programs.patch new file mode 100644 index 000000000..9c5b51f6a --- /dev/null +++ b/patches/meson-0.49.2/0004-Don-t-close-fds-when-executing-programs.patch @@ -0,0 +1,23 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Mon, 29 Apr 2019 11:28:45 +0200 +Subject: [PATCH] Don't close fds when executing programs + +This is basically the same as ca894a24fca452e5aa982e1fc5dc63117c3e3d71 just +for new new Popen_safe_legacy(). +--- + mesonbuild/mesonlib.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py +index 98c2366d6a48..b5df8473ee40 100644 +--- a/mesonbuild/mesonlib.py ++++ b/mesonbuild/mesonlib.py +@@ -917,7 +917,7 @@ def Popen_safe(args, write=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, + return p, o, e + + def Popen_safe_legacy(args, write=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, **kwargs): +- p = subprocess.Popen(args, universal_newlines=False, ++ p = subprocess.Popen(args, universal_newlines=False, close_fds=False, + stdout=stdout, stderr=stderr, **kwargs) + if write is not None: + write = write.encode('utf-8') diff --git a/patches/meson-0.49.2/series b/patches/meson-0.49.2/series index 119016a64..9445cad4d 100644 --- a/patches/meson-0.49.2/series +++ b/patches/meson-0.49.2/series @@ -3,4 +3,5 @@ 0001-only-use-paths-for-shared-libaries-in-get_link_dep_s.patch 0002-don-t-add-rpaths-for-build-directories-when-cross-co.patch 0003-HACK-don-t-loose-the-rpath-for-host-packages.patch -# 5cb122e1f6a7d12f6e2fc7dd5a2d329b - git-ptx-patches magic +0004-Don-t-close-fds-when-executing-programs.patch +# 648fdcce3df1dd2e0d3234bdbf0c8bff - git-ptx-patches magic |