Skip to contentSkip to conversation

python3: alternative name is python3-config not python-config

PATCH New Ross Burton 1 participant 4 messages Oct 17, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 python3: alternative name is python3-config not python-config

With python3-config using the 'python-config' name, it's possible for python-config to point at python3-config, which is obviously wrong.

---
 meta/recipes-devtools/python/python3_3.7.4.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-devtools/python/python3_3.7.4.bb +3 -3
index c8b63fee9d5..01230b0fec3 100644
@@ -59,9 +59,9 @@ inherit autotools pkgconfig qemu ptest multilib_header update-alternatives
 
 MULTILIB_SUFFIX = "${@d.getVar('base_libdir',1).split('/')[-1]}"
 
-ALTERNATIVE_${PN}-dev = "python-config"
-ALTERNATIVE_LINK_NAME[python-config] = "${bindir}/python${PYTHON_BINABI}-config"
-ALTERNATIVE_TARGET[python-config] = "${bindir}/python${PYTHON_BINABI}-config-${MULTILIB_SUFFIX}"
+ALTERNATIVE_${PN}-dev = "python3-config"
+ALTERNATIVE_LINK_NAME[python3-config] = "${bindir}/python${PYTHON_BINABI}-config"
+ALTERNATIVE_TARGET[python3-config] = "${bindir}/python${PYTHON_BINABI}-config-${MULTILIB_SUFFIX}"
 
 
 DEPENDS = "bzip2-replacement-native libffi bzip2 openssl sqlite3 zlib virtual/libintl xz virtual/crypt util-linux libtirpc libnsl2"
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/4 python3: ensure that all forms of python3-config are in python3-dev

In multilib builds python3-config gets renamed to eg python3-config-lib64 but this ends up being packaged in python3-core not python3-dev.

The manifest uses an extended glob to package all python* binaries that are not python-config into python3-core:

            "${bindir}/python*[!-config]",

However, this doesn't do what was intended, as [] is a range match.

Replace the globs with more verbose but precise matches, and clear out FILES_${PN} to ensure that new binaries don't end up in ${PN} (which shouldn't exist).

[ YOCTO #13592 ]

---
 meta/recipes-devtools/python/python3/python3-manifest.json | 6 ++++--
 meta/recipes-devtools/python/python3_3.7.4.bb              | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)
meta/recipes-devtools/python/python3/python3-manifest.json +4 -2
index 1ad85a9ff38..cd9dc847a8f 100644
@@ -210,7 +210,9 @@
         "summary": "Python interpreter and core modules",
         "rdepends": [],
         "files": [
-            "${bindir}/python*[!-config]",
+            "${bindir}/python3",
+            "${bindir}/python${PYTHON_MAJMIN}",
+            "${bindir}/python${PYTHON_BINABI}",
             "${includedir}/python${PYTHON_BINABI}/pyconfig*.h",
             "${prefix}/lib/python${PYTHON_MAJMIN}/config*/*[!.a]",
             "${libdir}/python${PYTHON_MAJMIN}/UserDict.py",
@@ -487,7 +489,7 @@
         "files": [
             "${base_libdir}/*.a",
             "${base_libdir}/*.o",
-            "${bindir}/python*-config",
+            "${bindir}/python*-config*",
             "${datadir}/aclocal",
             "${datadir}/pkgconfig",
             "${includedir}",
meta/recipes-devtools/python/python3_3.7.4.bb +4 -1
index 01230b0fec3..8c429e95c38 100644
@@ -303,11 +303,14 @@ do_create_manifest[depends] += "${PN}:do_prepare_recipe_sysroot"
 do_create_manifest[depends] += "${PN}:do_patch"
 
 # manual dependency additions
-RPROVIDES_${PN}-modules = "${PN}"
 RRECOMMENDS_${PN}-core_append_class-nativesdk = " nativesdk-python3-modules"
 RRECOMMENDS_${PN}-crypt_append_class-target = " openssl ca-certificates"
 RRECOMMENDS_${PN}-crypt_append_class-nativesdk = " openssl ca-certificates"
 
+# For historical reasons PN is empty and provided by python3-modules
+FILES_${PN} = ""
+RPROVIDES_${PN}-modules = "${PN}"
+
 FILES_${PN}-pydoc += "${bindir}/pydoc${PYTHON_MAJMIN} ${bindir}/pydoc3"
 FILES_${PN}-idle += "${bindir}/idle3 ${bindir}/idle${PYTHON_MAJMIN}"
 
Signature · 1 line
2.20.1
#2 lore raw

PATCH 3/4 python3: -dev should depend on distutils

In reply to Ross Burton

python3-config uses distutils:

Traceback (most recent call last):
File "/usr/bin/python3-config", line 9, in <module>
from distutils import sysconfig
ModuleNotFoundError: No module named 'distutils'

Add the dependency so that distutils is always present.

[ YOCTO #13592 ]

---
 meta/recipes-devtools/python/python3/python3-manifest.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-devtools/python/python3/python3-manifest.json +2 -1
index cd9dc847a8f..5fd9d7dd668 100644
@@ -500,7 +500,8 @@
             "${libdir}/pkgconfig"
         ],
         "rdepends": [
-            "core"
+            "core",
+            "distutils"
         ],
         "summary": "Python development package"
     },
Signature · 1 line
2.20.1
#3 lore raw

PATCH 4/4 gawk: add PACKAGECONFIG for readline

In reply to Ross Burton

Add a PACKAGECONFIG so that readline can be disabled if desired.

---
 meta/recipes-extended/gawk/gawk_5.0.1.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-extended/gawk/gawk_5.0.1.bb +2 -2
index b3eb39e4eda..eaba6c78eda 100644
@@ -11,8 +11,8 @@ SECTION = "console/utils"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-DEPENDS += "readline"
-
+PACKAGECONFIG ??= "readline"
+PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
 PACKAGECONFIG[mpfr] = "--with-mpfr,--without-mpfr, mpfr"
 
 SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \
Signature · 1 line
2.20.1