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-11 17:46:12 +0000 |
commit | c2feb63de8b85b92d2d07291f6fe1008cd558a73 (patch) | |
tree | 013c7b5e9f5ecf8e8906476b552eb8f117b6eb55 /meta | |
parent | a7ce6533ed617ed8928483a1375872b7ddaffcab (diff) | |
download | poky-c2feb63de8b85b92d2d07291f6fe1008cd558a73.tar.gz |
meta: drop _PYTHON_SYSCONFIGDATA_NAME hacks
(From OE-Core rev: 94a8eff9a95313e29683ebaecb83378a3c776b48)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 7901859e38de06c56b8535a8425e76cb114c57dc)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 e48b5cb67b..71777bc459 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc | |||
@@ -34,10 +34,6 @@ DEPENDS_append_class-target = "${@' gtk-doc' if d.getVar('GTKDOC_ENABLED') == 'T | |||
34 | 34 | ||
35 | GTKDOC_MESON_OPTION = "gtk_doc" | 35 | GTKDOC_MESON_OPTION = "gtk_doc" |
36 | 36 | ||
37 | # This avoids the need to depend on target python3, which in case of mingw is not even possible. | ||
38 | # meson's python configuration pokes into python3 configuration, so this provides the native config to it. | ||
39 | unset _PYTHON_SYSCONFIGDATA_NAME | ||
40 | |||
41 | S = "${WORKDIR}/glib-${PV}" | 37 | S = "${WORKDIR}/glib-${PV}" |
42 | 38 | ||
43 | PACKAGECONFIG ??= "system-pcre libmount \ | 39 | PACKAGECONFIG ??= "system-pcre libmount \ |
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 9fc62e95e1..a4c7007157 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
@@ -48,11 +48,6 @@ PROVIDES = " \ | |||
48 | 48 | ||
49 | inherit meson pkgconfig python3native gettext features_check | 49 | inherit meson pkgconfig python3native gettext features_check |
50 | 50 | ||
51 | # Unset these to stop python trying to report the target Python setup | ||
52 | _PYTHON_SYSCONFIGDATA_NAME[unexport] = "1" | ||
53 | STAGING_INCDIR[unexport] = "1" | ||
54 | STAGING_LIBDIR[unexport] = "1" | ||
55 | |||
56 | BBCLASSEXTEND = "native nativesdk" | 51 | BBCLASSEXTEND = "native nativesdk" |
57 | 52 | ||
58 | ANY_OF_DISTRO_FEATURES_class-target = "opengl vulkan" | 53 | ANY_OF_DISTRO_FEATURES_class-target = "opengl vulkan" |