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 <[email protected]>
johu · Oct 7, 2018 · fbc2ce2 · fbc2ce2
1 parent 8b39e7f
commit fbc2ce2
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/dev-util/meson/files/0.48.0-test-u.patch 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 <[email protected]>
+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 → dev-util/meson/meson-0.48.0-r2.ebuild b/dev-util/meson/meson-0.48.0-r1.ebuild → 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() {