diff --git a/dev-util/ccache/ccache-4.10.recipe b/dev-util/ccache/ccache-4.11.2.recipe similarity index 70% rename from dev-util/ccache/ccache-4.10.recipe rename to dev-util/ccache/ccache-4.11.2.recipe index cf3dbb088..d420502af 100644 --- a/dev-util/ccache/ccache-4.10.recipe +++ b/dev-util/ccache/ccache-4.11.2.recipe @@ -7,9 +7,9 @@ COPYRIGHT="2002-2007 Andrew Tridgell 2009-2022 Joel Rosdahl and other contributors" LICENSE="GNU GPL v3 GNU LGPL v3" -REVISION="3" +REVISION="1" SOURCE_URI="https://github.com/ccache/ccache/releases/download/v$portVersion/ccache-$portVersion.tar.xz" -CHECKSUM_SHA256="83630b5e922b998ab2538823e0cad962c0f956fad1fcf443dd5288269a069660" +CHECKSUM_SHA256="319390f276123968cfa565acc3da0b1e18414374b40ff25274230e6860352125" PATCHES="ccache-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" @@ -80,8 +80,24 @@ INSTALL() echo "# System-wide configuration for ccache" > $settingsDir/ccache.conf } +# Be sure to use -DENABLE_TESTING=ON on BUILD(), otherwise "make check" fails. +# +# Reference results on beta5 64 bits (workdir in RAMFS): +# 52% tests passed, 23 tests failed out of 48 +# Total Test time (real) = 39.52 sec +# (RAMFS usage causes many: "cannot make pipe for process substitution: Operation not supported") +# +# Reference results on beta5 64 bits (workdir in SSD): +# 88% tests passed, 6 tests failed out of 48 +# Total Test time (real) = 355.56 sec +# The following tests FAILED: +# 1 - unittest (Failed) +# 2 - test.base (Failed) +# 10 - test.debug_prefix_map (Failed) +# 23 - test.nocpp2 (Failed) +# 28 - test.pch (Failed) +# 46 - test.stats_log (Failed) TEST() { - # 87% tests passed, 6 tests failed out of 46 make -C build check } diff --git a/dev-util/ccache/patches/ccache-4.10.patchset b/dev-util/ccache/patches/ccache-4.11.2.patchset similarity index 73% rename from dev-util/ccache/patches/ccache-4.10.patchset rename to dev-util/ccache/patches/ccache-4.11.2.patchset index cfae7ae47..e93100f46 100644 --- a/dev-util/ccache/patches/ccache-4.10.patchset +++ b/dev-util/ccache/patches/ccache-4.11.2.patchset @@ -1,11 +1,11 @@ -From 0d68f28e1dff78b7424cf072cc04536a9b6672d7 Mon Sep 17 00:00:00 2001 +From c517d85f3e2a1b4e0e9877035f2709818ed3c276 Mon Sep 17 00:00:00 2001 From: begasus Date: Sat, 13 Nov 2021 08:28:23 +0000 Subject: Haiku doesn't support hard links diff --git a/test/suites/base.bash b/test/suites/base.bash -index b7eab53..8ae7b11 100644 +index 6cbbaae..828f61f 100644 --- a/test/suites/base.bash +++ b/test/suites/base.bash @@ -176,7 +176,7 @@ base_tests() { @@ -17,7 +17,7 @@ index b7eab53..8ae7b11 100644 $CCACHE_COMPILE -c test1.ccc 2>/dev/null expect_stat unsupported_source_language 1 -@@ -766,7 +766,7 @@ b" +@@ -773,7 +773,7 @@ b" # ------------------------------------------------------------------------- TEST "-x c" @@ -26,7 +26,7 @@ index b7eab53..8ae7b11 100644 $CCACHE_COMPILE -x c -c test1.ccc expect_stat preprocessed_cache_hit 0 -@@ -779,7 +779,7 @@ b" +@@ -786,7 +786,7 @@ b" # ------------------------------------------------------------------------- TEST "-xc" @@ -36,20 +36,20 @@ index b7eab53..8ae7b11 100644 $CCACHE_COMPILE -xc -c test1.ccc expect_stat preprocessed_cache_hit 0 -- -2.43.2 +2.48.1 -From 4c9bcb77a9cd2669ea61f86a21c561895d63b56d Mon Sep 17 00:00:00 2001 +From 621bccd21806e5fea48b204a40afc993c4733380 Mon Sep 17 00:00:00 2001 From: begasus Date: Sat, 13 Nov 2021 12:28:11 +0000 Subject: Link against libnetwork diff --git a/CMakeLists.txt b/CMakeLists.txt -index acedac4..25443eb 100644 +index 590fdfe..608b855 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -115,6 +115,10 @@ if(ENABLE_DOCUMENTATION) +@@ -116,6 +116,10 @@ if(ENABLE_DOCUMENTATION) add_subdirectory(doc) endif() @@ -61,28 +61,28 @@ index acedac4..25443eb 100644 # Installation # -- -2.43.2 +2.48.1 -From 197a9bf13ea6c2657f0b87b58ac1de2bd968c644 Mon Sep 17 00:00:00 2001 +From 50bd505ad8fa7ea3d884ce3b43dabf170a80c085 Mon Sep 17 00:00:00 2001 From: Zardshard <0azrune6@zard.anonaddy.com> Date: Tue, 4 Jun 2024 21:28:56 -0400 Subject: Do not use /run/user directory -diff --git a/src/ccache/Config.cpp b/src/ccache/Config.cpp -index b4974e1..8a6836d 100644 ---- a/src/ccache/Config.cpp -+++ b/src/ccache/Config.cpp -@@ -1194,7 +1194,7 @@ std::string +diff --git a/src/ccache/config.cpp b/src/ccache/config.cpp +index ef0fb2a..dc2facd 100644 +--- a/src/ccache/config.cpp ++++ b/src/ccache/config.cpp +@@ -1241,7 +1241,7 @@ fs::path Config::default_temporary_dir() const { - static const std::string run_user_tmp_dir = [] { + static const fs::path run_user_tmp_dir = [] { -#ifndef _WIN32 +#if !defined(_WIN32) && !defined(HAIKU) const char* const xdg_runtime_dir = getenv("XDG_RUNTIME_DIR"); if (xdg_runtime_dir && DirEntry(xdg_runtime_dir).is_directory()) { - auto dir = FMT("{}/ccache-tmp", xdg_runtime_dir); + fs::path dir = FMT("{}/ccache-tmp", xdg_runtime_dir); -- -2.43.2 +2.48.1