diff options
3 files changed, 46 insertions, 5 deletions
diff --git a/meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patch b/meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patch new file mode 100644 index 0000000000..c15295c034 --- /dev/null +++ b/meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From e3b59cb9658e1d3efa3535840939a0fa92a70a5a Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Mon, 7 Oct 2019 13:22:14 +0200 | ||
4 | Subject: [PATCH] setup.py: do not report missing dependencies for disabled | ||
5 | modules | ||
6 | |||
7 | Reporting those missing dependencies is misleading as the modules would not | ||
8 | have been built anyway. This particularly matters in oe-core's automated | ||
9 | build completeness checker which relies on the report. | ||
10 | |||
11 | Upstream-Status: Inappropriate [oe-core specific] | ||
12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
13 | --- | ||
14 | setup.py | 4 ++++ | ||
15 | 1 file changed, 4 insertions(+) | ||
16 | |||
17 | diff --git a/setup.py b/setup.py | ||
18 | index 4b53668..0097643 100644 | ||
19 | --- a/setup.py | ||
20 | +++ b/setup.py | ||
21 | @@ -365,6 +365,10 @@ class PyBuildExt(build_ext): | ||
22 | print("%-*s %-*s %-*s" % (longest, e, longest, f, | ||
23 | longest, g)) | ||
24 | |||
25 | + # There is no need to report missing module dependencies, | ||
26 | + # if the modules have been disabled in the first place. | ||
27 | + missing = list(set(missing) - set(sysconf_dis)) | ||
28 | + | ||
29 | if missing: | ||
30 | print() | ||
31 | print("Python build finished successfully!") | ||
diff --git a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch index 0bafec73c0..d49604ba4d 100644 --- a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch +++ b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6229502e5ae6cbb22240594f002638e9ef78f831 Mon Sep 17 00:00:00 2001 | 1 | From a274ba778838824efcacaba57c415b7262f779ec Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Tue, 14 May 2013 15:00:26 -0700 | 3 | Date: Tue, 14 May 2013 15:00:26 -0700 |
4 | Subject: [PATCH] python3: Add target and native recipes | 4 | Subject: [PATCH] python3: Add target and native recipes |
diff --git a/meta/recipes-devtools/python/python3_3.7.7.bb b/meta/recipes-devtools/python/python3_3.7.7.bb index bff84f640b..be67c81d7c 100644 --- a/meta/recipes-devtools/python/python3_3.7.7.bb +++ b/meta/recipes-devtools/python/python3_3.7.7.bb | |||
@@ -28,6 +28,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ | |||
28 | file://reformat_sysconfig.py \ | 28 | file://reformat_sysconfig.py \ |
29 | file://0001-Use-FLAG_REF-always-for-interned-strings.patch \ | 29 | file://0001-Use-FLAG_REF-always-for-interned-strings.patch \ |
30 | file://0001-test_locale.py-correct-the-test-output-format.patch \ | 30 | file://0001-test_locale.py-correct-the-test-output-format.patch \ |
31 | file://0017-setup.py-do-not-report-missing-dependencies-for-disa.patch \ | ||
31 | file://0001-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch \ | 32 | file://0001-bpo-39503-CVE-2020-8492-Fix-AbstractBasicAuthHandler.patch \ |
32 | " | 33 | " |
33 | 34 | ||
@@ -67,7 +68,7 @@ ALTERNATIVE_LINK_NAME[python-config] = "${bindir}/python${PYTHON_BINABI}-config" | |||
67 | ALTERNATIVE_TARGET[python-config] = "${bindir}/python${PYTHON_BINABI}-config-${MULTILIB_SUFFIX}" | 68 | ALTERNATIVE_TARGET[python-config] = "${bindir}/python${PYTHON_BINABI}-config-${MULTILIB_SUFFIX}" |
68 | 69 | ||
69 | 70 | ||
70 | DEPENDS = "bzip2-replacement-native libffi bzip2 gdbm openssl sqlite3 zlib virtual/libintl xz virtual/crypt util-linux libtirpc libnsl2" | 71 | DEPENDS = "bzip2-replacement-native libffi bzip2 openssl sqlite3 zlib virtual/libintl xz virtual/crypt util-linux libtirpc libnsl2" |
71 | DEPENDS_append_class-target = " python3-native" | 72 | DEPENDS_append_class-target = " python3-native" |
72 | DEPENDS_append_class-nativesdk = " python3-native" | 73 | DEPENDS_append_class-nativesdk = " python3-native" |
73 | 74 | ||
@@ -92,13 +93,22 @@ python() { | |||
92 | d.setVar('PACKAGECONFIG_PGO', '') | 93 | d.setVar('PACKAGECONFIG_PGO', '') |
93 | } | 94 | } |
94 | 95 | ||
95 | PACKAGECONFIG_class-target ??= "readline ${PACKAGECONFIG_PGO}" | 96 | PACKAGECONFIG_class-target ??= "readline ${PACKAGECONFIG_PGO} gdbm" |
96 | PACKAGECONFIG_class-native ??= "readline" | 97 | PACKAGECONFIG_class-native ??= "readline gdbm" |
97 | PACKAGECONFIG_class-nativesdk ??= "readline" | 98 | PACKAGECONFIG_class-nativesdk ??= "readline gdbm" |
98 | PACKAGECONFIG[readline] = ",,readline" | 99 | PACKAGECONFIG[readline] = ",,readline" |
99 | # Use profile guided optimisation by running PyBench inside qemu-user | 100 | # Use profile guided optimisation by running PyBench inside qemu-user |
100 | PACKAGECONFIG[pgo] = "--enable-optimizations,,qemu-native" | 101 | PACKAGECONFIG[pgo] = "--enable-optimizations,,qemu-native" |
101 | PACKAGECONFIG[tk] = ",,tk" | 102 | PACKAGECONFIG[tk] = ",,tk" |
103 | PACKAGECONFIG[gdbm] = ",,gdbm" | ||
104 | |||
105 | do_configure_prepend () { | ||
106 | mkdir -p ${B}/Modules | ||
107 | cat > ${B}/Modules/Setup.local << EOF | ||
108 | *disabled* | ||
109 | ${@bb.utils.contains('PACKAGECONFIG', 'gdbm', '', '_gdbm _dbm', d)} | ||
110 | EOF | ||
111 | } | ||
102 | 112 | ||
103 | CPPFLAGS_append = " -I${STAGING_INCDIR}/ncursesw -I${STAGING_INCDIR}/uuid" | 113 | CPPFLAGS_append = " -I${STAGING_INCDIR}/ncursesw -I${STAGING_INCDIR}/uuid" |
104 | 114 | ||