summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-util/ccache/files/ccache-3.4-size-on-disk.patch22
-rw-r--r--dev-util/ccache/files/ccache-3.6-disable-sized-cleanup.patch26
2 files changed, 0 insertions, 48 deletions
diff --git a/dev-util/ccache/files/ccache-3.4-size-on-disk.patch b/dev-util/ccache/files/ccache-3.4-size-on-disk.patch
deleted file mode 100644
index a2f4a554cab3..000000000000
--- a/dev-util/ccache/files/ccache-3.4-size-on-disk.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/456178
-https://github.com/ccache/ccache/issues/442
-
-stick to the size of files on disk rather than their byte size.
-this func is only used for stats management, so this should be safe.
-
---- a/src/util.c
-+++ b/src/util.c
-@@ -845,12 +845,7 @@ file_size(struct stat *st)
- #ifdef _WIN32
- return (st->st_size + 1023) & ~1023;
- #else
-- size_t size = st->st_blocks * 512;
-- if ((size_t)st->st_size > size) {
-- // Probably a broken stat() call...
-- size = (st->st_size + 1023) & ~1023;
-- }
-- return size;
-+ return st->st_blocks * 512;
- #endif
- }
-
diff --git a/dev-util/ccache/files/ccache-3.6-disable-sized-cleanup.patch b/dev-util/ccache/files/ccache-3.6-disable-sized-cleanup.patch
deleted file mode 100644
index dcb5cf1f497a..000000000000
--- a/dev-util/ccache/files/ccache-3.6-disable-sized-cleanup.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugs.gentoo.org/649440
-https://github.com/ccache/ccache/issues/442
-
-Disable cleanup based on free filesystem size.
-
---- a/test/suites/cleanup.bash
-+++ b/test/suites/cleanup.bash
-@@ -75,6 +75,9 @@ SUITE_cleanup() {
- done
-
- # -------------------------------------------------------------------------
-+# Disable test in Gentoo as we don't control temporary filesystem:
-+# https://bugs.gentoo.org/649440
-+if false; then
- TEST "Forced cache cleanup, size limit"
-
- # NOTE: This test is known to fail on filesystems that have unusual block
-@@ -101,7 +104,7 @@ SUITE_cleanup() {
- file=$CCACHE_DIR/a/result$i-4017.o
- expect_file_exists $file
- done
--
-+fi
- # -------------------------------------------------------------------------
- TEST "Automatic cache cleanup, limit_multiple 0.9"
-