commit: fbc2ce256a57d79917378e5e16916771c58c84e2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sun Oct 7 00:26:14 2018 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sun Oct 7 00:26:14 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbc2ce25
dev-util/meson: backport fix for meson test -u Closes: https://bugs.gentoo.org/667010 Package-Manager: Portage-2.3.50_p10, Repoman-2.3.11_p17 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> dev-util/meson/files/0.48.0-test-u.patch | 28 ++++++++++++++++++++++ ...son-0.48.0-r1.ebuild => meson-0.48.0-r2.ebuild} | 1 + 2 files changed, 29 insertions(+) diff --git a/dev-util/meson/files/0.48.0-test-u.patch b/dev-util/meson/files/0.48.0-test-u.patch new file mode 100644 index 00000000000..099d4686b96 --- /dev/null +++ b/dev-util/meson/files/0.48.0-test-u.patch @@ -0,0 +1,28 @@ +From 99ecedc0930a99fb4d084208964e4c7922a6efec Mon Sep 17 00:00:00 2001 +From: Masanori Kakura <kakura...@gmail.com> +Date: Tue, 25 Sep 2018 18:04:06 +0900 +Subject: [PATCH] environment: Use os.path.basename() when checking + mesonlib.meson_command + +Without this, when one of Meson's parent directories contains +"python", unexpected option "-u" will be passed to Meson. +--- + mesonbuild/environment.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py +index 7a44f2fd..a0c2fda4 100644 +--- a/mesonbuild/environment.py ++++ b/mesonbuild/environment.py +@@ -375,7 +375,7 @@ class Environment: + + def get_build_command(self, unbuffered=False): + cmd = mesonlib.meson_command[:] +- if unbuffered and 'python' in cmd[0]: ++ if unbuffered and 'python' in os.path.basename(cmd[0]): + cmd.insert(1, '-u') + return cmd + +-- +2.19.0 + diff --git a/dev-util/meson/meson-0.48.0-r1.ebuild b/dev-util/meson/meson-0.48.0-r2.ebuild similarity index 96% rename from dev-util/meson/meson-0.48.0-r1.ebuild rename to dev-util/meson/meson-0.48.0-r2.ebuild index d0fbb01b472..aa2d0f068eb 100644 --- a/dev-util/meson/meson-0.48.0-r1.ebuild +++ b/dev-util/meson/meson-0.48.0-r2.ebuild @@ -27,6 +27,7 @@ RDEPEND="" PATCHES=( "${FILESDIR}"/0.48.0-multilib.patch + "${FILESDIR}"/0.48.0-test-u.patch ) python_test() {
