summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2020-10-19 19:29:29 +0100
committerSergei Trofimovich <slyfox@gentoo.org>2020-10-19 19:49:27 +0100
commitb56cb58add4cebf0e0a8828a253fd193a9be262c (patch)
tree86aac57d7a1b4b77f5b97db6c671745781f82441 /dev-util/ccache/files
parentnet-p2p/qbittorrent: Version bum (v4.3.0) (diff)
downloadgentoo-b56cb58add4cebf0e0a8828a253fd193a9be262c.tar.gz
gentoo-b56cb58add4cebf0e0a8828a253fd193a9be262c.tar.bz2
gentoo-b56cb58add4cebf0e0a8828a253fd193a9be262c.zip
dev-util/ccache: bump up to 4.0
A few major changes: - move from zlib to zstdd compression - move from md4 to xxhash hash - expanded license from GPL-3 to LGPL-3 - man page disappeared Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'dev-util/ccache/files')
-rw-r--r--dev-util/ccache/files/ccache-4.0-avoid-run-user.patch18
-rw-r--r--dev-util/ccache/files/ccache-4.0-objdump.patch12
2 files changed, 30 insertions, 0 deletions
diff --git a/dev-util/ccache/files/ccache-4.0-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.0-avoid-run-user.patch
new file mode 100644
index 000000000000..07da25c6c341
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.0-avoid-run-user.patch
@@ -0,0 +1,18 @@
+Gentoo's sandbox does not whitelist this path by default yet.
+TODO: bug link.
+
+Until we have a sandbox whitelisting the path let's rely on ccache's default.
+--- a/src/Config.cpp
++++ b/src/Config.cpp
+@@ -833,11 +833,5 @@ Config::check_key_tables_consistency()
+ std::string
+ Config::default_temporary_dir(const std::string& cache_dir)
+ {
+-#ifdef HAVE_GETEUID
+- std::string user_tmp_dir = fmt::format("/run/user/{}", geteuid());
+- if (Stat::stat(user_tmp_dir).is_directory()) {
+- return user_tmp_dir + "/ccache-tmp";
+- }
+-#endif
+ return cache_dir + "/tmp";
+ }
diff --git a/dev-util/ccache/files/ccache-4.0-objdump.patch b/dev-util/ccache/files/ccache-4.0-objdump.patch
new file mode 100644
index 000000000000..af48e997f50b
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.0-objdump.patch
@@ -0,0 +1,12 @@
+Allow ${CHOST}-objdump (or any other override)
+--- a/test/run
++++ b/test/run
+@@ -133,7 +133,7 @@ objdump_cmd() {
+ # back to brute force and ignorance.
+ strings "$1"
+ else
+- objdump -W "$file"
++ ${OBJDUMP-objdump} -W "$file"
+ fi
+ }
+