From: Johannes Schrimpf <dev@loewen-email.de>
Date: Tue, 25 Apr 2023 09:15:32 +0000 (+0200)
Subject: python3targetconfig.bbclass: Extend PYTHONPATH instead of overwriting
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~1048
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2442ab92f8610784d28d8d83056b643bd95b0b4e;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

python3targetconfig.bbclass: Extend PYTHONPATH instead of overwriting

[YOCTO #15108] -- https://bugzilla.yoctoproject.org/show_bug.cgi?id=15108

Since the latest change, the PYTHONPATH is overwritten instead of extended.
This leads to changed behavior and build errors of recipes where the PYTHONPATH
is set before setup_target_config is run.

Fixes: c9617c03bcee ("python3targetconfig.bbclass: use PYTHONPATH to point to the target config")
Signed-off-by: Johannes Schrimpf <dev@loewen-email.de>
[Luca: add Fixes: tag]
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes-recipe/python3targetconfig.bbclass b/meta/classes-recipe/python3targetconfig.bbclass
index 22305fe1760..08bc619398f 100644
--- a/meta/classes-recipe/python3targetconfig.bbclass
+++ b/meta/classes-recipe/python3targetconfig.bbclass
@@ -12,7 +12,7 @@ DEPENDS:append = " ${EXTRA_PYTHON_DEPENDS}"
 
 setup_target_config() {
         export _PYTHON_SYSCONFIGDATA_NAME="_sysconfigdata"
-        export PYTHONPATH=${STAGING_LIBDIR}/python-sysconfigdata
+        export PYTHONPATH=${STAGING_LIBDIR}/python-sysconfigdata:$PYTHONPATH
         export PATH=${STAGING_EXECPREFIXDIR}/python-target-config/:$PATH
 }