diff options
| -rw-r--r-- | meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch | 8 | ||||
| -rw-r--r-- | meta/recipes-devtools/meson/meson_1.6.1.bb (renamed from meta/recipes-devtools/meson/meson_1.6.0.bb) | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch index 23f96f4788..84a9c18c51 100644 --- a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch +++ b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 4ff04d388baf9d31efa73a92c0124a8d45b65377 Mon Sep 17 00:00:00 2001 | 1 | From f264b7fd2c86edfd5db77da264e8bf05f5e2bfeb Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Mon, 19 Nov 2018 14:24:26 +0100 | 3 | Date: Mon, 19 Nov 2018 14:24:26 +0100 |
| 4 | Subject: [PATCH] python module: do not manipulate the environment when calling | 4 | Subject: [PATCH] python module: do not manipulate the environment when calling |
| @@ -11,10 +11,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
| 11 | 1 file changed, 1 insertion(+), 5 deletions(-) | 11 | 1 file changed, 1 insertion(+), 5 deletions(-) |
| 12 | 12 | ||
| 13 | diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py | 13 | diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py |
| 14 | index fff4aaa..1fde2f6 100644 | 14 | index 326e605..f5eb50f 100644 |
| 15 | --- a/mesonbuild/dependencies/python.py | 15 | --- a/mesonbuild/dependencies/python.py |
| 16 | +++ b/mesonbuild/dependencies/python.py | 16 | +++ b/mesonbuild/dependencies/python.py |
| 17 | @@ -400,9 +400,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', | 17 | @@ -403,9 +403,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', |
| 18 | empty.name = 'python' | 18 | empty.name = 'python' |
| 19 | return empty | 19 | return empty |
| 20 | 20 | ||
| @@ -24,7 +24,7 @@ index fff4aaa..1fde2f6 100644 | |||
| 24 | try: | 24 | try: |
| 25 | return PythonPkgConfigDependency(name, env, kwargs, installation, True) | 25 | return PythonPkgConfigDependency(name, env, kwargs, installation, True) |
| 26 | finally: | 26 | finally: |
| 27 | @@ -411,8 +408,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', | 27 | @@ -414,8 +411,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', |
| 28 | os.environ[name] = value | 28 | os.environ[name] = value |
| 29 | elif name in os.environ: | 29 | elif name in os.environ: |
| 30 | del os.environ[name] | 30 | del os.environ[name] |
diff --git a/meta/recipes-devtools/meson/meson_1.6.0.bb b/meta/recipes-devtools/meson/meson_1.6.1.bb index 078e49e973..249a07c290 100644 --- a/meta/recipes-devtools/meson/meson_1.6.0.bb +++ b/meta/recipes-devtools/meson/meson_1.6.1.bb | |||
| @@ -16,7 +16,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \ | |||
| 16 | file://0002-Support-building-allarch-recipes-again.patch \ | 16 | file://0002-Support-building-allarch-recipes-again.patch \ |
| 17 | file://0001-dependencies-dev-prepend-sysroot-when-searching-for-.patch \ | 17 | file://0001-dependencies-dev-prepend-sysroot-when-searching-for-.patch \ |
| 18 | " | 18 | " |
| 19 | SRC_URI[sha256sum] = "999b65f21c03541cf11365489c1fad22e2418bb0c3d50ca61139f2eec09d5496" | 19 | SRC_URI[sha256sum] = "1eca49eb6c26d58bbee67fd3337d8ef557c0804e30a6d16bfdf269db997464de" |
| 20 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)$" | 20 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)$" |
| 21 | 21 | ||
| 22 | inherit python_setuptools_build_meta github-releases | 22 | inherit python_setuptools_build_meta github-releases |
