diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-11-13 20:48:53 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-18 16:48:29 +0000 |
commit | 35c82292467710aa147ae6fca6da14bb88b97b82 (patch) | |
tree | 96ec4f71df9b153ca257c935f452d17742841d04 | |
parent | b543853a991e7b8fbd727dd1b6a7263a1b7ececb (diff) | |
download | poky-35c82292467710aa147ae6fca6da14bb88b97b82.tar.gz |
meta: drop _PYTHON_SYSCONFIGDATA_NAME hacks
(From OE-Core rev: 961b6ce18c4dfff2fa54306230480dbd0cd970ee)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit d3a81dd0e72a3495bfc7cc969c2bb806b666023d)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/scons.bbclass | 3 | ||||
-rw-r--r-- | meta/lib/oe/prservice.py | 4 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 4 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 5 |
4 files changed, 0 insertions, 16 deletions
diff --git a/meta/classes/scons.bbclass b/meta/classes/scons.bbclass index 6b171ca8df..4f3ae502ef 100644 --- a/meta/classes/scons.bbclass +++ b/meta/classes/scons.bbclass | |||
@@ -5,7 +5,6 @@ DEPENDS += "python3-scons-native" | |||
5 | EXTRA_OESCONS ?= "" | 5 | EXTRA_OESCONS ?= "" |
6 | 6 | ||
7 | do_configure() { | 7 | do_configure() { |
8 | unset _PYTHON_SYSCONFIGDATA_NAME | ||
9 | if [ -n "${CONFIGURESTAMPFILE}" ]; then | 8 | if [ -n "${CONFIGURESTAMPFILE}" ]; then |
10 | if [ -e "${CONFIGURESTAMPFILE}" -a "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" -a "${CLEANBROKEN}" != "1" ]; then | 9 | if [ -e "${CONFIGURESTAMPFILE}" -a "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" -a "${CLEANBROKEN}" != "1" ]; then |
11 | ${STAGING_BINDIR_NATIVE}/scons --clean PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} | 10 | ${STAGING_BINDIR_NATIVE}/scons --clean PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} |
@@ -17,13 +16,11 @@ do_configure() { | |||
17 | } | 16 | } |
18 | 17 | ||
19 | scons_do_compile() { | 18 | scons_do_compile() { |
20 | unset _PYTHON_SYSCONFIGDATA_NAME | ||
21 | ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} || \ | 19 | ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} || \ |
22 | die "scons build execution failed." | 20 | die "scons build execution failed." |
23 | } | 21 | } |
24 | 22 | ||
25 | scons_do_install() { | 23 | scons_do_install() { |
26 | unset _PYTHON_SYSCONFIGDATA_NAME | ||
27 | ${STAGING_BINDIR_NATIVE}/scons install_root=${D}${prefix} PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} install || \ | 24 | ${STAGING_BINDIR_NATIVE}/scons install_root=${D}${prefix} PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} install || \ |
28 | die "scons install execution failed." | 25 | die "scons install execution failed." |
29 | } | 26 | } |
diff --git a/meta/lib/oe/prservice.py b/meta/lib/oe/prservice.py index 2d3c9c7e50..fcdbe66c19 100644 --- a/meta/lib/oe/prservice.py +++ b/meta/lib/oe/prservice.py | |||
@@ -3,10 +3,6 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | def prserv_make_conn(d, check = False): | 5 | def prserv_make_conn(d, check = False): |
6 | # Otherwise this fails when called from recipes which e.g. inherit python3native (which sets _PYTHON_SYSCONFIGDATA_NAME) with: | ||
7 | # No module named '_sysconfigdata' | ||
8 | if '_PYTHON_SYSCONFIGDATA_NAME' in os.environ: | ||
9 | del os.environ['_PYTHON_SYSCONFIGDATA_NAME'] | ||
10 | import prserv.serv | 6 | import prserv.serv |
11 | host_params = list([_f for _f in (d.getVar("PRSERV_HOST") or '').split(':') if _f]) | 7 | host_params = list([_f for _f in (d.getVar("PRSERV_HOST") or '').split(':') if _f]) |
12 | try: | 8 | try: |
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 7ebed0e5fd..c3ddf18387 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc | |||
@@ -32,10 +32,6 @@ inherit meson gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bas | |||
32 | 32 | ||
33 | GTKDOC_MESON_OPTION = "gtk_doc" | 33 | GTKDOC_MESON_OPTION = "gtk_doc" |
34 | 34 | ||
35 | # This avoids the need to depend on target python3, which in case of mingw is not even possible. | ||
36 | # meson's python configuration pokes into python3 configuration, so this provides the native config to it. | ||
37 | unset _PYTHON_SYSCONFIGDATA_NAME | ||
38 | |||
39 | S = "${WORKDIR}/glib-${PV}" | 35 | S = "${WORKDIR}/glib-${PV}" |
40 | 36 | ||
41 | PACKAGECONFIG ??= "system-pcre libmount \ | 37 | PACKAGECONFIG ??= "system-pcre libmount \ |
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index b7ef496fdc..a1bf878b1a 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
@@ -26,11 +26,6 @@ PROVIDES = " \ | |||
26 | 26 | ||
27 | inherit meson pkgconfig python3native gettext features_check | 27 | inherit meson pkgconfig python3native gettext features_check |
28 | 28 | ||
29 | # Unset these to stop python trying to report the target Python setup | ||
30 | _PYTHON_SYSCONFIGDATA_NAME[unexport] = "1" | ||
31 | STAGING_INCDIR[unexport] = "1" | ||
32 | STAGING_LIBDIR[unexport] = "1" | ||
33 | |||
34 | BBCLASSEXTEND = "native nativesdk" | 29 | BBCLASSEXTEND = "native nativesdk" |
35 | 30 | ||
36 | ANY_OF_DISTRO_FEATURES_class-target = "opengl vulkan" | 31 | ANY_OF_DISTRO_FEATURES_class-target = "opengl vulkan" |