mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00
Code Issues Projects Releases Wiki Activity

meta: drop _PYTHON_SYSCONFIGDATA_NAME hacks

Browse Source 
(From OE-Core rev: d3a81dd0e72a3495bfc7cc969c2bb806b666023d)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2020-11-13 20:48:53 +01:00
committed by Richard Purdie
parent 3ec7f79ad2
commit acfdab8daa
4 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/scons.bbclass
-3
View File
@@ -5,7 +5,6 @@ DEPENDS += "python3-scons-native"
EXTRA_OESCONS ?= "" EXTRA_OESCONS ?= ""
do_configure() { do_configure() {
unset _PYTHON_SYSCONFIGDATA_NAME
if [ -n "${CONFIGURESTAMPFILE}" ]; then if [ -n "${CONFIGURESTAMPFILE}" ]; then
if [ -e "${CONFIGURESTAMPFILE}" -a "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" -a "${CLEANBROKEN}" != "1" ]; then if [ -e "${CONFIGURESTAMPFILE}" -a "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" -a "${CLEANBROKEN}" != "1" ]; then
${STAGING_BINDIR_NATIVE}/scons --clean PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} ${STAGING_BINDIR_NATIVE}/scons --clean PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS}
@@ -17,13 +16,11 @@ do_configure() {
} }
scons_do_compile() { scons_do_compile() {
unset _PYTHON_SYSCONFIGDATA_NAME
${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} || \ ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} || \
die "scons build execution failed." die "scons build execution failed."
} }
scons_do_install() { scons_do_install() {
unset _PYTHON_SYSCONFIGDATA_NAME
${STAGING_BINDIR_NATIVE}/scons install_root=${D}${prefix} PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} install || \ ${STAGING_BINDIR_NATIVE}/scons install_root=${D}${prefix} PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} install || \
die "scons install execution failed." die "scons install execution failed."
} }
meta/lib/oe/prservice.py
-4
View File
@@ -3,10 +3,6 @@
# #
def prserv_make_conn(d, check = False): def prserv_make_conn(d, check = False):
# Otherwise this fails when called from recipes which e.g. inherit python3native (which sets _PYTHON_SYSCONFIGDATA_NAME) with:
# No module named '_sysconfigdata'
if '_PYTHON_SYSCONFIGDATA_NAME' in os.environ:
del os.environ['_PYTHON_SYSCONFIGDATA_NAME']
import prserv.serv import prserv.serv
host_params = list([_f for _f in (d.getVar("PRSERV_HOST") or '').split(':') if _f]) host_params = list([_f for _f in (d.getVar("PRSERV_HOST") or '').split(':') if _f])
try: try:
meta/recipes-core/glib-2.0/glib.inc
-4
View File
@@ -34,10 +34,6 @@ DEPENDS_append_class-target = "${@' gtk-doc' if d.getVar('GTKDOC_ENABLED') == 'T
GTKDOC_MESON_OPTION = "gtk_doc" GTKDOC_MESON_OPTION = "gtk_doc"
# This avoids the need to depend on target python3, which in case of mingw is not even possible.
# meson's python configuration pokes into python3 configuration, so this provides the native config to it.
unset _PYTHON_SYSCONFIGDATA_NAME
S = "${WORKDIR}/glib-${PV}" S = "${WORKDIR}/glib-${PV}"
PACKAGECONFIG ??= "system-pcre libmount \ PACKAGECONFIG ??= "system-pcre libmount \
meta/recipes-graphics/mesa/mesa.inc
-5
View File
@@ -49,11 +49,6 @@ PROVIDES = " \
inherit meson pkgconfig python3native gettext features_check inherit meson pkgconfig python3native gettext features_check
# Unset these to stop python trying to report the target Python setup
_PYTHON_SYSCONFIGDATA_NAME[unexport] = "1"
STAGING_INCDIR[unexport] = "1"
STAGING_LIBDIR[unexport] = "1"
BBCLASSEXTEND = "native nativesdk" BBCLASSEXTEND = "native nativesdk"
ANY_OF_DISTRO_FEATURES_class-target = "opengl vulkan" ANY_OF_DISTRO_FEATURES_class-target = "opengl vulkan"