diff options
author | Mingli Yu <mingli.yu@windriver.com> | 2020-07-22 21:02:36 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-07-25 15:11:05 +0100 |
commit | 3439ad86168937edfb90120f1e9c86886f03bd71 (patch) | |
tree | 26ccefb962aebab787e0aa5a0599b8f9aecff6b0 /meta/recipes-devtools | |
parent | b28b7c7c6acbe6e110aa7feb89690673c3f4535b (diff) | |
download | poky-3439ad86168937edfb90120f1e9c86886f03bd71.tar.gz |
Revert "python3: define a profile directory path"
After ccache upgrade to 3.7.11, there is below logic introduced.
58895dc Add knowledge about -fprofile-{correction,reorder-functions,values}
And the python3 ccache build issue [1] is fixed in ccache 3.7.11, so there
is no need to define a profile directory path for python3 any more.
[1] https://github.com/ccache/ccache/issues/615
(From OE-Core rev: 6cd08bdf72c05982ba000b1186cf139382679e04)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/python/python3/0001-configure.ac-define-a-path-for-profile-data.patch | 42 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3_3.8.3.bb | 1 |
2 files changed, 0 insertions, 43 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 deleted file mode 100644 index ee3d645521..0000000000 --- a/meta/recipes-devtools/python/python3/0001-configure.ac-define-a-path-for-profile-data.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From 5e94e315119117898ce1a2798641848f61d796b1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
3 | Date: Thu, 9 Jul 2020 07:58:44 +0000 | ||
4 | Subject: [PATCH] configure.ac: define a path for profile data | ||
5 | |||
6 | There comes below error when use ccache 3.7.10 to compile python3 | ||
7 | and 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 | |||
10 | That's because the logic for profile directory changes a little in | ||
11 | [2] after ccache upgrades to 3.7.10. | ||
12 | |||
13 | So 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 | |||
18 | Upstream-Status: Submitted [https://github.com/python/cpython/pull/21408] | ||
19 | |||
20 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
21 | --- | ||
22 | configure.ac | 4 ++-- | ||
23 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
24 | |||
25 | diff --git a/configure.ac b/configure.ac | ||
26 | index 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 | -- | ||
41 | 2.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 7e0f35ce41..a7cfbad5cd 100644 --- a/meta/recipes-devtools/python/python3_3.8.3.bb +++ b/meta/recipes-devtools/python/python3_3.8.3.bb | |||
@@ -32,7 +32,6 @@ 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 \ | ||
36 | " | 35 | " |
37 | 36 | ||
38 | SRC_URI_append_class-native = " \ | 37 | SRC_URI_append_class-native = " \ |