Skip to contentSkip to conversation

distutils-base: stop using distutils-common-base which now triggers warning about distutils removal in Python 3.12

PATCH In review Martin Jansa 2 participants 2 messages Jan 18, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 distutils-base: stop using distutils-common-base which now triggers warning about distutils removal in Python 3.12

* distutils removal in Python 3.12 doesn't affect already EOL Python2 recipes

---
 classes/distutils-base.bbclass | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)
classes/distutils-base.bbclass +31 -1
index 803dc8b..26aadad 100644
@@ -1,4 +1,34 @@
 DEPENDS  += "${@["${PYTHON_PN}-native ${PYTHON_PN}", ""][(d.getVar('PACKAGES') == '')]}"
 RDEPENDS:${PN} += "${@['', '${PYTHON_PN}-core']['${CLASSOVERRIDE}' == 'class-target']}"
 
-inherit distutils-common-base pythonnative
+inherit pythonnative
+
+# the rest is meta/classes/distutils-common-base.bbclass before the bb.warn was added in:
+# https://git.openembedded.org/openembedded-core/commit/?id=54b455049ee94c01c78b31b6c744c8e32b5b7737
+# as the distutils removal in Python 3.12 doesn't affect already EOL Python2 recipes
+
+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 \
+"
Signature · 1 line
2.32.0
Acked-by Tim Orlnig on v1 1/1
#1 lore raw

Thank you for this JaMa, it will make the move of distutils* classes to meta-python smoother. And when we drop distutils-common-base from oe-core it won't impact meta-python2.

Thank you also for maintaining meta-python2. I do appreciate it.

Quoted 5 lines · Martin Jansa

* distutils removal in Python 3.12 doesn't affect already EOL Python2 recipes

Quoted 65 lines
---
 classes/distutils-base.bbclass | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)
classes/distutils-base.bbclass +0 -0
index 803dc8b..26aadad 100644
@@ -1,4 +1,34 @@
 DEPENDS  += "${@["${PYTHON_PN}-native ${PYTHON_PN}",

""][(d.getVar('PACKAGES') == '')]}"
RDEPENDS:${PN} += "${@['', '${PYTHON_PN}-core']['${CLASSOVERRIDE}' ==
'class-target']}"

classes/distutils-base.bbclass +3 -1
-inherit distutils-common-base pythonnative
+inherit pythonnative
+
+# the rest is meta/classes/distutils-common-base.bbclass before the

bb.warn was added in:
+#
https://git.openembedded.org/openembedded-core/commit/?id=54b455049ee94c01c78b31b6c744c8e32b5b7737
+# as the distutils removal in Python 3.12 doesn't affect already EOL Python2 recipes

classes/distutils-base.bbclass +26 -1
+
+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 \
+"
--

2.32.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#94910):
https://lists.openembedded.org/g/openembedded-devel/message/94910
Mute This Topic: https://lists.openembedded.org/mt/88505319/924729
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-