[patch] 0001-distutils-r1.eclass-ensure-meson-python-uses-a-stabl.patch (needs tweaking for dir though)

file_905400.txt (text/plain), 1.66 KB, created by Sam James on 2023-05-01 07:51:33 UTC

From 793ebcd0948dafb372baf7b552f637068e9a6a78 Mon Sep 17 00:00:00 2001
From: Eli Schwartz <[e-mail]>
Date: Mon, 1 May 2023 00:16:57 -0400
Subject: [PATCH] distutils-r1.eclass: ensure meson-python uses a stable build
 directory

When not passing an explicit build directory, meson-python configures
meson into a build directory that is rooted in a tempdir with a random
suffix. This results in unstable paths, which currently disappear after
meson-python completes (either with success or failure). It doesn't
handle incremental or resumed builds, and it's very difficult to debug
-- for example by inspecting the logfile that meson itself prints out
when the configure stage fails.

Bug: https://bugs.gentoo.org/905396
Signed-off-by: Eli Schwartz <[e-mail]>
Signed-off-by: Sam James <[e-mail]>
---
 eclass/distutils-r1.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 4346a86c20974..f9adb7f9b0627 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -1326,6 +1326,7 @@ distutils_pep517_install() {
 
 						ninjaopts = shlex.split(os.environ["NINJAOPTS"])
 						print(json.dumps({
+							"builddir": os.environ["WHEEL_BUILD_DIR"] + "/builddir",
 							"setup-args": sys.argv[1:],
 							"compile-args": ["-v"] + ninjaopts,
 						}))
@@ -1341,6 +1342,7 @@ distutils_pep517_install() {
 
 						ninjaopts = shlex.split(os.environ["NINJAOPTS"])
 						print(json.dumps({
+							"builddir": os.environ["WHEEL_BUILD_DIR"] + "/builddir",
 							"setup-args": sys.argv[1:],
 							"compile-args": [
 								"-v",
-- 
2.40.1