summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMingli Yu <mingli.yu@windriver.com>2020-07-22 21:02:36 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-25 15:11:00 +0100
commit6cd08bdf72c05982ba000b1186cf139382679e04 (patch)
treee75b45d9ec8ebbdeeccd9931ca3f81c00e64c56c /meta
parent1fea06a83aa226a86eb2032ce4e000009d71eaa5 (diff)
downloadopenembedded-core-contrib-6cd08bdf72c05982ba000b1186cf139382679e04.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 Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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, 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 @@
-From 5e94e315119117898ce1a2798641848f61d796b1 Mon Sep 17 00:00:00 2001
-From: Mingli Yu <mingli.yu@windriver.com>
-Date: Thu, 9 Jul 2020 07:58:44 +0000
-Subject: [PATCH] configure.ac: define a path for profile data
-
-There comes below error when use ccache 3.7.10 to compile python3
-and check [1] 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
-[2] 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://github.com/ccache/ccache/commit/91a2954eb47b4a106e2be6cf611917b895108e35
-
-Upstream-Status: Submitted [https://github.com/python/cpython/pull/21408]
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 08fe397..bb15bda 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1332,8 +1332,8 @@ case $cc_basename in
- fi
- ;;
- *)
-- PGO_PROF_GEN_FLAG="-fprofile-generate"
-- PGO_PROF_USE_FLAG="-fprofile-use -fprofile-correction"
-+ PGO_PROF_GEN_FLAG="-fprofile-generate=$(pwd)"
-+ PGO_PROF_USE_FLAG="-fprofile-use=$(pwd) -fprofile-correction"
- LLVM_PROF_MERGER="true"
- LLVM_PROF_FILE=""
- ;;
---
-2.26.2
-
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 \
file://0001-configure.ac-fix-LIBPL.patch \
file://0001-python3-Do-not-hardcode-lib-for-distutils.patch \
file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \
- file://0001-configure.ac-define-a-path-for-profile-data.patch \
"
SRC_URI_append_class-native = " \