summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/scons.bbclass3
-rw-r--r--meta/lib/oe/prservice.py4
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc4
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc5
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"
5EXTRA_OESCONS ?= "" 5EXTRA_OESCONS ?= ""
6 6
7do_configure() { 7do_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
19scons_do_compile() { 18scons_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
25scons_do_install() { 23scons_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
5def prserv_make_conn(d, check = False): 5def 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 a0055d81b0..06f4ae137e 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
35GTKDOC_MESON_OPTION = "gtk_doc" 35GTKDOC_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.
39unset _PYTHON_SYSCONFIGDATA_NAME
40
41S = "${WORKDIR}/glib-${PV}" 37S = "${WORKDIR}/glib-${PV}"
42 38
43PACKAGECONFIG ??= "system-pcre libmount \ 39PACKAGECONFIG ??= "system-pcre libmount \
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index ca593b8b1f..a6652b0ddb 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -49,11 +49,6 @@ PROVIDES = " \
49 49
50inherit meson pkgconfig python3native gettext features_check 50inherit meson pkgconfig python3native gettext features_check
51 51
52# Unset these to stop python trying to report the target Python setup
53_PYTHON_SYSCONFIGDATA_NAME[unexport] = "1"
54STAGING_INCDIR[unexport] = "1"
55STAGING_LIBDIR[unexport] = "1"
56
57BBCLASSEXTEND = "native nativesdk" 52BBCLASSEXTEND = "native nativesdk"
58 53
59ANY_OF_DISTRO_FEATURES_class-target = "opengl vulkan" 54ANY_OF_DISTRO_FEATURES_class-target = "opengl vulkan"