summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2025-07-29 09:59:29 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-07-31 10:48:35 +0100
commitdfa34c27bd14e491b1e92b1545029321bfce4d34 (patch)
tree6dc332f6f3673888a1b305260a86ede6949ba1b7
parentc31d01e0138b3b3c9f8cdb1557c26d2d8383770d (diff)
downloadpoky-dfa34c27bd14e491b1e92b1545029321bfce4d34.tar.gz
python_pep517: set CONFIGURE_FILES
Move the CONFIGURE_FILES assignment from python_mesonpy to the common class, as it isn't specific to mesonpy. Also extend, so that it doesn't clobber existing settings. (From OE-Core rev: 049cd6b62853c020b0c85ccee18638ec58887866) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes-recipe/python_mesonpy.bbclass2
-rw-r--r--meta/classes-recipe/python_pep517.bbclass3
2 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes-recipe/python_mesonpy.bbclass b/meta/classes-recipe/python_mesonpy.bbclass
index 81c087c7c7..37b231cef5 100644
--- a/meta/classes-recipe/python_mesonpy.bbclass
+++ b/meta/classes-recipe/python_mesonpy.bbclass
@@ -17,8 +17,6 @@ meson_do_qa_configure () {
17# ERROR: Got argument buildtype as both -Dbuildtype and --buildtype. Pick one. 17# ERROR: Got argument buildtype as both -Dbuildtype and --buildtype. Pick one.
18MESONOPTS:remove = "--buildtype ${MESON_BUILDTYPE}" 18MESONOPTS:remove = "--buildtype ${MESON_BUILDTYPE}"
19 19
20CONFIGURE_FILES = "pyproject.toml"
21
22DEPENDS += "python3-wheel-native python3-meson-python-native" 20DEPENDS += "python3-wheel-native python3-meson-python-native"
23 21
24def mesonpy_get_args(d): 22def mesonpy_get_args(d):
diff --git a/meta/classes-recipe/python_pep517.bbclass b/meta/classes-recipe/python_pep517.bbclass
index e8cd1923ef..2c144d39b3 100644
--- a/meta/classes-recipe/python_pep517.bbclass
+++ b/meta/classes-recipe/python_pep517.bbclass
@@ -61,3 +61,6 @@ python_pep517_do_bootstrap_install () {
61} 61}
62 62
63EXPORT_FUNCTIONS do_configure do_compile do_install 63EXPORT_FUNCTIONS do_configure do_compile do_install
64
65# Tell externalsrc this changing means it needs to reconfigure
66CONFIGURE_FILES += "pyproject.toml"