From c5a0fcc70191b55bf81f86f9001cfd9af67559fb Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Thu, 24 Feb 2022 12:11:29 -0800 Subject: distutils*.bbclass: move from oe-core distutils has been deprecated in Python 3.10 and will be removed in Python 3.12 (predicted release date October 2023). For now, move these classes from oe-core to allow users to migrate. A deprecation warning has been added to each class. Documentation is also being dropped in oe-core, but users can refer to 3.4 documentation for the legacy variables and classes. [YOCTO #14610] Signed-off-by: Tim Orling --- meta-python/classes/distutils-common-base.bbclass | 28 +++++++++ meta-python/classes/distutils3-base.bbclass | 9 +++ meta-python/classes/distutils3.bbclass | 71 +++++++++++++++++++++++ 3 files changed, 108 insertions(+) create mode 100644 meta-python/classes/distutils-common-base.bbclass create mode 100644 meta-python/classes/distutils3-base.bbclass create mode 100644 meta-python/classes/distutils3.bbclass diff --git a/meta-python/classes/distutils-common-base.bbclass b/meta-python/classes/distutils-common-base.bbclass new file mode 100644 index 0000000000..59c750a3cf --- /dev/null +++ b/meta-python/classes/distutils-common-base.bbclass @@ -0,0 +1,28 @@ +export STAGING_INCDIR +export STAGING_LIBDIR + +# LDSHARED is the ld *command* used to create shared library +export LDSHARED = "${CCLD} -shared" +# LDXXSHARED is the ld *command* used to create shared library of C++ +# objects +export LDCXXSHARED = "${CXX} -shared" +# CCSHARED are the C *flags* used to create objects to go into a shared +# library (module) +export CCSHARED = "-fPIC -DPIC" +# LINKFORSHARED are the flags passed to the $(CC) command that links +# the python executable +export LINKFORSHARED = "${SECURITY_CFLAGS} -Xlinker -export-dynamic" + +FILES:${PN} += "${libdir}/* ${libdir}/${PYTHON_DIR}/*" + +FILES:${PN}-staticdev += "\ + ${PYTHON_SITEPACKAGES_DIR}/*.a \ +" +FILES:${PN}-dev += "\ + ${datadir}/pkgconfig \ + ${libdir}/pkgconfig \ + ${PYTHON_SITEPACKAGES_DIR}/*.la \ +" +python __anonymous() { + bb.warn("distutils-common-base.bbclass is deprecated, please use setuptools3-base.bbclass instead") +} diff --git a/meta-python/classes/distutils3-base.bbclass b/meta-python/classes/distutils3-base.bbclass new file mode 100644 index 0000000000..850c535bb1 --- /dev/null +++ b/meta-python/classes/distutils3-base.bbclass @@ -0,0 +1,9 @@ +DEPENDS:append:class-target = " ${PYTHON_PN}-native ${PYTHON_PN}" +DEPENDS:append:class-nativesdk = " ${PYTHON_PN}-native ${PYTHON_PN}" +RDEPENDS:${PN} += "${@['', '${PYTHON_PN}-core']['${CLASSOVERRIDE}' == 'class-target']}" + +inherit distutils-common-base python3native python3targetconfig + +python __anonymous() { + bb.warn("distutils3-base.bbclass is deprecated, please use setuptools3-base.bbclass instead") + diff --git a/meta-python/classes/distutils3.bbclass b/meta-python/classes/distutils3.bbclass new file mode 100644 index 0000000000..a6d8e8763f --- /dev/null +++ b/meta-python/classes/distutils3.bbclass @@ -0,0 +1,71 @@ +inherit distutils3-base + +B = "${WORKDIR}/build" +distutils_do_configure[cleandirs] = "${B}" + +DISTUTILS_BUILD_ARGS ?= "" +DISTUTILS_INSTALL_ARGS ?= "--root=${D} \ + --prefix=${prefix} \ + --install-lib=${PYTHON_SITEPACKAGES_DIR} \ + --install-data=${datadir}" + +DISTUTILS_PYTHON = "python3" +DISTUTILS_PYTHON:class-native = "nativepython3" + +DISTUTILS_SETUP_PATH ?= "${S}" + +python __anonymous() { + bb.warn("distutils3.bbclass is deprecated, please use setuptools3.bbclass instead") +} + +distutils3_do_configure() { + : +} + +distutils3_do_compile() { + cd ${DISTUTILS_SETUP_PATH} + NO_FETCH_BUILD=1 \ + STAGING_INCDIR=${STAGING_INCDIR} \ + STAGING_LIBDIR=${STAGING_LIBDIR} \ + ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \ + build --build-base=${B} ${DISTUTILS_BUILD_ARGS} || \ + bbfatal_log "'${PYTHON_PN} setup.py build ${DISTUTILS_BUILD_ARGS}' execution failed." +} +distutils3_do_compile[vardepsexclude] = "MACHINE" + +distutils3_do_install() { + cd ${DISTUTILS_SETUP_PATH} + install -d ${D}${PYTHON_SITEPACKAGES_DIR} + STAGING_INCDIR=${STAGING_INCDIR} \ + STAGING_LIBDIR=${STAGING_LIBDIR} \ + PYTHONPATH=${D}${PYTHON_SITEPACKAGES_DIR} \ + ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \ + build --build-base=${B} install --skip-build ${DISTUTILS_INSTALL_ARGS} || \ + bbfatal_log "'${PYTHON_PN} setup.py install ${DISTUTILS_INSTALL_ARGS}' execution failed." + + # support filenames with *spaces* + find ${D} -name "*.py" -exec grep -q ${D} {} \; \ + -exec sed -i -e s:${D}::g {} \; + + for i in ${D}${bindir}/* ${D}${sbindir}/*; do + if [ -f "$i" ]; then + sed -i -e s:${PYTHON}:${USRBINPATH}/env\ ${DISTUTILS_PYTHON}:g $i + sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i + fi + done + + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/easy-install.pth + + # + # FIXME: Bandaid against wrong datadir computation + # + if [ -e ${D}${datadir}/share ]; then + mv -f ${D}${datadir}/share/* ${D}${datadir}/ + rmdir ${D}${datadir}/share + fi +} +distutils3_do_install[vardepsexclude] = "MACHINE" + +EXPORT_FUNCTIONS do_configure do_compile do_install + +export LDSHARED="${CCLD} -shared" -- cgit 1.2.3-korg