summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python
diff options
context:
space:
mode:
authorMingli Yu <mingli.yu@windriver.com>2020-07-09 16:48:17 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-12 12:21:48 +0100
commit9e856a0a1a76bc4ba5fa050be038dd702cc58185 (patch)
tree5544fb38d89d2774d9f19060370d5ff4d22481dc /meta/recipes-devtools/python
parent30a1502c5a62b5cc411bb9bfb2b6706b9e39f6d6 (diff)
downloadpoky-9e856a0a1a76bc4ba5fa050be038dd702cc58185.tar.gz
python3: define a profile directory path
After ccache upgrade to 3.7.10, there comes below error when enable ccache to build python3 and check [1] and [2] for more details. | Python-3.8.3/Modules/_contextvarsmodule.c:43:1: error: source locations for function 'PyInit__contextvars' have changed, the profile data may be out of date [-Werror=coverage-mismatch] That's because the logic for profile directory changes a little in [3] after ccache upgrades to 3.7.10. So define a profile directory path accordingly to fix the above error. [1] https://github.com/ccache/ccache/issues/615 [2] https://lists.openembedded.org/g/openembedded-core/topic/75170448#140065 [3] https://github.com/ccache/ccache/commit/91a2954eb47b4a106e2be6cf611917b895108e35 (From OE-Core rev: 0000d30fb82aafa5064051502a927c5fc447b63b) Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python')
-rw-r--r--meta/recipes-devtools/python/python3/0001-configure.ac-define-a-path-for-profile-data.patch42
-rw-r--r--meta/recipes-devtools/python/python3_3.8.3.bb1
2 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python3/0001-configure.ac-define-a-path-for-profile-data.patch b/meta/recipes-devtools/python/python3/0001-configure.ac-define-a-path-for-profile-data.patch
new file mode 100644
index 0000000000..ee3d645521
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-configure.ac-define-a-path-for-profile-data.patch
@@ -0,0 +1,42 @@
1From 5e94e315119117898ce1a2798641848f61d796b1 Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Thu, 9 Jul 2020 07:58:44 +0000
4Subject: [PATCH] configure.ac: define a path for profile data
5
6There comes below error when use ccache 3.7.10 to compile python3
7and check [1] for more details.
8 | Python-3.8.3/Modules/_contextvarsmodule.c:43:1: error: source locations for function 'PyInit__contextvars' have changed, the profile data may be out of date [-Werror=coverage-mismatch]
9
10That's because the logic for profile directory changes a little in
11[2] after ccache upgrades to 3.7.10.
12
13So define a profile directory path accordingly to fix the above error.
14
15[1] https://github.com/ccache/ccache/issues/615
16[2] https://github.com/ccache/ccache/commit/91a2954eb47b4a106e2be6cf611917b895108e35
17
18Upstream-Status: Submitted [https://github.com/python/cpython/pull/21408]
19
20Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
21---
22 configure.ac | 4 ++--
23 1 file changed, 2 insertions(+), 2 deletions(-)
24
25diff --git a/configure.ac b/configure.ac
26index 08fe397..bb15bda 100644
27--- a/configure.ac
28+++ b/configure.ac
29@@ -1332,8 +1332,8 @@ case $cc_basename in
30 fi
31 ;;
32 *)
33- PGO_PROF_GEN_FLAG="-fprofile-generate"
34- PGO_PROF_USE_FLAG="-fprofile-use -fprofile-correction"
35+ PGO_PROF_GEN_FLAG="-fprofile-generate=$(pwd)"
36+ PGO_PROF_USE_FLAG="-fprofile-use=$(pwd) -fprofile-correction"
37 LLVM_PROF_MERGER="true"
38 LLVM_PROF_FILE=""
39 ;;
40--
412.26.2
42
diff --git a/meta/recipes-devtools/python/python3_3.8.3.bb b/meta/recipes-devtools/python/python3_3.8.3.bb
index a7cfbad5cd..7e0f35ce41 100644
--- a/meta/recipes-devtools/python/python3_3.8.3.bb
+++ b/meta/recipes-devtools/python/python3_3.8.3.bb
@@ -32,6 +32,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
32 file://0001-configure.ac-fix-LIBPL.patch \ 32 file://0001-configure.ac-fix-LIBPL.patch \
33 file://0001-python3-Do-not-hardcode-lib-for-distutils.patch \ 33 file://0001-python3-Do-not-hardcode-lib-for-distutils.patch \
34 file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \ 34 file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \
35 file://0001-configure.ac-define-a-path-for-profile-data.patch \
35 " 36 "
36 37
37SRC_URI_append_class-native = " \ 38SRC_URI_append_class-native = " \