mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 01:19:52 +00:00
python3: make gdbm optional
The use case is building a gpl3-free image, without having to rely on outdated recipes from meta-gplv2 layer. (From OE-Core rev: 033a63507d1ccd423b8023575729ff089614303b) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
9771da0a54
commit
eeef7b053f
+31
@@ -0,0 +1,31 @@
|
|||||||
|
From e3b59cb9658e1d3efa3535840939a0fa92a70a5a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||||
|
Date: Mon, 7 Oct 2019 13:22:14 +0200
|
||||||
|
Subject: [PATCH] setup.py: do not report missing dependencies for disabled
|
||||||
|
modules
|
||||||
|
|
||||||
|
Reporting those missing dependencies is misleading as the modules would not
|
||||||
|
have been built anyway. This particularly matters in oe-core's automated
|
||||||
|
build completeness checker which relies on the report.
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [oe-core specific]
|
||||||
|
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||||
|
---
|
||||||
|
setup.py | 4 ++++
|
||||||
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/setup.py b/setup.py
|
||||||
|
index 4b53668..0097643 100644
|
||||||
|
--- a/setup.py
|
||||||
|
+++ b/setup.py
|
||||||
|
@@ -365,6 +365,10 @@ class PyBuildExt(build_ext):
|
||||||
|
print("%-*s %-*s %-*s" % (longest, e, longest, f,
|
||||||
|
longest, g))
|
||||||
|
|
||||||
|
+ # There is no need to report missing module dependencies,
|
||||||
|
+ # if the modules have been disabled in the first place.
|
||||||
|
+ missing = list(set(missing) - set(sysconf_dis))
|
||||||
|
+
|
||||||
|
if missing:
|
||||||
|
print()
|
||||||
|
print("Python build finished successfully!")
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
From 6229502e5ae6cbb22240594f002638e9ef78f831 Mon Sep 17 00:00:00 2001
|
From a274ba778838824efcacaba57c415b7262f779ec Mon Sep 17 00:00:00 2001
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
Date: Tue, 14 May 2013 15:00:26 -0700
|
Date: Tue, 14 May 2013 15:00:26 -0700
|
||||||
Subject: [PATCH] python3: Add target and native recipes
|
Subject: [PATCH] python3: Add target and native recipes
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
|
|||||||
file://reformat_sysconfig.py \
|
file://reformat_sysconfig.py \
|
||||||
file://0001-Use-FLAG_REF-always-for-interned-strings.patch \
|
file://0001-Use-FLAG_REF-always-for-interned-strings.patch \
|
||||||
file://0001-test_locale.py-correct-the-test-output-format.patch \
|
file://0001-test_locale.py-correct-the-test-output-format.patch \
|
||||||
|
file://0017-setup.py-do-not-report-missing-dependencies-for-disa.patch \
|
||||||
file://0001-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch \
|
file://0001-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
@@ -67,7 +68,7 @@ ALTERNATIVE_LINK_NAME[python-config] = "${bindir}/python${PYTHON_BINABI}-config"
|
|||||||
ALTERNATIVE_TARGET[python-config] = "${bindir}/python${PYTHON_BINABI}-config-${MULTILIB_SUFFIX}"
|
ALTERNATIVE_TARGET[python-config] = "${bindir}/python${PYTHON_BINABI}-config-${MULTILIB_SUFFIX}"
|
||||||
|
|
||||||
|
|
||||||
DEPENDS = "bzip2-replacement-native libffi bzip2 gdbm openssl sqlite3 zlib virtual/libintl xz virtual/crypt util-linux libtirpc libnsl2"
|
DEPENDS = "bzip2-replacement-native libffi bzip2 openssl sqlite3 zlib virtual/libintl xz virtual/crypt util-linux libtirpc libnsl2"
|
||||||
DEPENDS_append_class-target = " python3-native"
|
DEPENDS_append_class-target = " python3-native"
|
||||||
DEPENDS_append_class-nativesdk = " python3-native"
|
DEPENDS_append_class-nativesdk = " python3-native"
|
||||||
|
|
||||||
@@ -92,13 +93,22 @@ python() {
|
|||||||
d.setVar('PACKAGECONFIG_PGO', '')
|
d.setVar('PACKAGECONFIG_PGO', '')
|
||||||
}
|
}
|
||||||
|
|
||||||
PACKAGECONFIG_class-target ??= "readline ${PACKAGECONFIG_PGO}"
|
PACKAGECONFIG_class-target ??= "readline ${PACKAGECONFIG_PGO} gdbm"
|
||||||
PACKAGECONFIG_class-native ??= "readline"
|
PACKAGECONFIG_class-native ??= "readline gdbm"
|
||||||
PACKAGECONFIG_class-nativesdk ??= "readline"
|
PACKAGECONFIG_class-nativesdk ??= "readline gdbm"
|
||||||
PACKAGECONFIG[readline] = ",,readline"
|
PACKAGECONFIG[readline] = ",,readline"
|
||||||
# Use profile guided optimisation by running PyBench inside qemu-user
|
# Use profile guided optimisation by running PyBench inside qemu-user
|
||||||
PACKAGECONFIG[pgo] = "--enable-optimizations,,qemu-native"
|
PACKAGECONFIG[pgo] = "--enable-optimizations,,qemu-native"
|
||||||
PACKAGECONFIG[tk] = ",,tk"
|
PACKAGECONFIG[tk] = ",,tk"
|
||||||
|
PACKAGECONFIG[gdbm] = ",,gdbm"
|
||||||
|
|
||||||
|
do_configure_prepend () {
|
||||||
|
mkdir -p ${B}/Modules
|
||||||
|
cat > ${B}/Modules/Setup.local << EOF
|
||||||
|
*disabled*
|
||||||
|
${@bb.utils.contains('PACKAGECONFIG', 'gdbm', '', '_gdbm _dbm', d)}
|
||||||
|
EOF
|
||||||
|
}
|
||||||
|
|
||||||
CPPFLAGS_append = " -I${STAGING_INCDIR}/ncursesw -I${STAGING_INCDIR}/uuid"
|
CPPFLAGS_append = " -I${STAGING_INCDIR}/ncursesw -I${STAGING_INCDIR}/uuid"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user