Skip to contentSkip to conversation

ccache: Upgrade to 3.7.11

PATCH New Yu, Mingli 1 participant 2 messages Jul 23, 2020

lore
Share & tools
lore

Yu, Mingli

author
#0 lore raw

PATCH 1/2 ccache: Upgrade to 3.7.11

From: Mingli Yu <[email protected]>

Bug fixes:
Added knowledge about -fprofile-{correction,reorder-functions,values}.
ccache now handles the Intel compiler option -xCODE (where CODE is a processor feature code) correctly. Added support for NVCC's -Werror and --Werror options.

---
 .../ccache/{ccache_3.7.10.bb => ccache_3.7.11.bb}               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/ccache/{ccache_3.7.10.bb => ccache_3.7.11.bb} (91%)
meta/recipes-devtools/ccache/ccache_3.7.11.bb renamed from meta/recipes-devtools/ccache/ccache_3.7.10.bb +1 -1
similarity index 91%
rename from meta/recipes-devtools/ccache/ccache_3.7.10.bb
rename to meta/recipes-devtools/ccache/ccache_3.7.11.bb
index 852583dfd2..fd004f4c9b 100644
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=22d514dbc01fdf9a9784334b6b59417a"
 DEPENDS = "zlib"
 
 SRC_URI = "https://github.com/ccache/ccache/releases/download/v${PV}/${BP}.tar.gz"
-SRC_URI[sha256sum] = "447ddf21a5f0ffa6b6d26839ae876a6d17d0d7e3533926cdf78ecd11dad793f8"
+SRC_URI[sha256sum] = "34309a59d4b6b6b33756366aa9d3144a4655587be9f914476b4c0e2d36365f01"
 
 UPSTREAM_CHECK_URI = "https://github.com/ccache/ccache/releases/"
 
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 2/2 Revert "python3: define a profile directory path"

From: Mingli Yu <[email protected]>

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

---
 ...re.ac-define-a-path-for-profile-data.patch | 42 -------------------
 meta/recipes-devtools/python/python3_3.8.3.bb |  1 -
 2 files changed, 43 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python3/0001-configure.ac-define-a-path-for-profile-data.patch
meta/recipes-devtools/python/python3/0001-configure.ac-define-a-path-for-profile-data.patch deleted +0 -42
deleted file mode 100644
index ee3d645521..0000000000
@@ -1,42 +0,0 @@
-From 5e94e315119117898ce1a2798641848f61d796b1 Mon Sep 17 00:00:00 2001
-From: Mingli Yu <[email protected]>
-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 <[email protected]>
----
- 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
-
meta/recipes-devtools/python/python3_3.8.3.bb +0 -1
index 7e0f35ce41..a7cfbad5cd 100644
@@ -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 = " \
Signature · 1 line
2.17.1