diff options
author | Tim Orling <ticotimo@gmail.com> | 2022-02-24 21:30:50 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-25 15:06:46 +0000 |
commit | 782ce913b3611da8571a758c821b1491493eabec (patch) | |
tree | fd558e0574ae7312bfdd97bb517de3dc4d2cab78 /meta/classes | |
parent | 327c6272e31a2862c21e1c06ccf779eb1aefab14 (diff) | |
download | openembedded-core-contrib-782ce913b3611da8571a758c821b1491493eabec.tar.gz |
disutils*.bbclasses: move to meta-python
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 meta-python to allow users to migrate.
[YOCTO #14610]
Signed-off-by: Tim Orling <tim.orling@konsulko.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/distutils-common-base.bbclass | 28 | ||||
-rw-r--r-- | meta/classes/distutils3-base.bbclass | 9 | ||||
-rw-r--r-- | meta/classes/distutils3.bbclass | 71 |
3 files changed, 0 insertions, 108 deletions
diff --git a/meta/classes/distutils-common-base.bbclass b/meta/classes/distutils-common-base.bbclass deleted file mode 100644 index 59c750a3cf..0000000000 --- a/meta/classes/distutils-common-base.bbclass +++ /dev/null @@ -1,28 +0,0 @@ -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/classes/distutils3-base.bbclass b/meta/classes/distutils3-base.bbclass deleted file mode 100644 index 850c535bb1..0000000000 --- a/meta/classes/distutils3-base.bbclass +++ /dev/null @@ -1,9 +0,0 @@ -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/classes/distutils3.bbclass b/meta/classes/distutils3.bbclass deleted file mode 100644 index a6d8e8763f..0000000000 --- a/meta/classes/distutils3.bbclass +++ /dev/null @@ -1,71 +0,0 @@ -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" |