diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-04-25 11:56:31 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-04-25 11:56:36 +0200 |
| commit | 181192847b3d9731774615a023b50507da4e4b37 (patch) | |
| tree | e5aeda8f6ef056008cd47a042be9e67b3b8da348 | |
| parent | 9543f3eb80a077e6e7349fafa2fa36498a83d766 (diff) | |
| download | ptxdist-181192847b3d9731774615a023b50507da4e4b37.tar.gz ptxdist-181192847b3d9731774615a023b50507da4e4b37.tar.xz | |
host-meson: version bump 0.39.1 -> 0.40.0
The patch is already upstream.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/meson-0.39.1/0001-Don-t-close-fds-when-executing-programs.patch | 22 | ||||
| -rw-r--r-- | patches/meson-0.39.1/series | 4 | ||||
| -rw-r--r-- | rules/host-meson.make | 4 |
3 files changed, 2 insertions, 28 deletions
diff --git a/patches/meson-0.39.1/0001-Don-t-close-fds-when-executing-programs.patch b/patches/meson-0.39.1/0001-Don-t-close-fds-when-executing-programs.patch deleted file mode 100644 index c03c7b750..000000000 --- a/patches/meson-0.39.1/0001-Don-t-close-fds-when-executing-programs.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Tue, 11 Apr 2017 15:17:48 +0200 -Subject: [PATCH] Don't close fds when executing programs - -Tools that execute meson might open file descriptors for the programs to -use. Such as a file descriptor for a logfile. ---- - mesonbuild/mesonlib.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py -index c7368d577ad8..7f328f5e3334 100644 ---- a/mesonbuild/mesonlib.py -+++ b/mesonbuild/mesonlib.py -@@ -492,6 +492,7 @@ def expand_arguments(args): - - def Popen_safe(args, write=None, stderr=subprocess.PIPE, **kwargs): - p = subprocess.Popen(args, universal_newlines=True, -+ close_fds=False, - stdout=subprocess.PIPE, - stderr=stderr, **kwargs) - o, e = p.communicate(write) diff --git a/patches/meson-0.39.1/series b/patches/meson-0.39.1/series deleted file mode 100644 index e7c266701..000000000 --- a/patches/meson-0.39.1/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-Don-t-close-fds-when-executing-programs.patch -# c6cd115d7186058355e5a5e87a498b96 - git-ptx-patches magic diff --git a/rules/host-meson.make b/rules/host-meson.make index b27fa55e8..5f583cdfb 100644 --- a/rules/host-meson.make +++ b/rules/host-meson.make @@ -16,8 +16,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_MESON) += host-meson # # Paths and names # -HOST_MESON_VERSION := 0.39.1 -HOST_MESON_MD5 := cad2171942901e6fd341dd907dc3baaa +HOST_MESON_VERSION := 0.40.0 +HOST_MESON_MD5 := a4975aea4323a519aad9223ef059737d HOST_MESON := meson-$(HOST_MESON_VERSION) HOST_MESON_SUFFIX := tar.gz HOST_MESON_URL := https://github.com/mesonbuild/meson/archive/$(HOST_MESON_VERSION).$(HOST_MESON_SUFFIX) |