diff --git a/dev-util/ccache/ccache-3.7.6.recipe b/dev-util/ccache/ccache-3.7.6.recipe deleted file mode 100644 index 221d3b1ec..000000000 --- a/dev-util/ccache/ccache-3.7.6.recipe +++ /dev/null @@ -1,70 +0,0 @@ -SUMMARY="A fast compiler cache" -DESCRIPTION="ccache speeds up recompilation by caching previous \ -compilations and detecting when same compilation is being done again. \ -Supported languages are C, C++, Objective-C and Objective-C++." -HOMEPAGE="https://ccache.samba.org/" -COPYRIGHT="2002-2007 Andrew Tridgell - 2009-2019 Joel Rosdahl" -LICENSE="GNU GPL v3" -REVISION="1" -SOURCE_URI="https://github.com/ccache/ccache/releases/download/v$portVersion/ccache-$portVersion.tar.xz" -CHECKSUM_SHA256="73e2633ac9bca387b5a39c72a8f85634670c4091dab639228c433898163c86c0" -PATCHES="ccache-$portVersion.patchset" - -ARCHITECTURES="all !x86_gcc2" -SECONDARY_ARCHITECTURES="x86" - -GLOBAL_WRITABLE_FILES="settings/ccache.conf keep-old" -USER_SETTINGS_FILES="settings/ccache.conf" - -# On x86_gcc2 we don't want to install the commands in bin//, but in bin/. -commandSuffix=$secondaryArchSuffix -commandBinDir=$binDir -if [ "$targetArchitecture" = x86_gcc2 ]; then - commandSuffix= - commandBinDir=$prefix/bin -fi - -PROVIDES=" - ccache$secondaryArchSuffix = $portVersion - cmd:ccache$commandSuffix - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:awk - cmd:gcc$secondaryArchSuffix - cmd:make - cmd:xargs - " - -TEST_REQUIRES=" - cmd:cmp - cmd:perl - " - -BUILD() -{ - runConfigure --omit-dirs "binDir sysconfDir" ./configure \ - --bindir=$commandBinDir \ - --sysconfdir="`finddir B_SYSTEM_SETTINGS_DIRECTORY`" - make $jobArgs -} - -INSTALL() -{ - make install - echo "# System-wide configuration for ccache" > $settingsDir/ccache.conf -} - -TEST() -{ - make check -} diff --git a/dev-util/ccache/ccache-4.6.recipe b/dev-util/ccache/ccache-4.10.recipe similarity index 92% rename from dev-util/ccache/ccache-4.6.recipe rename to dev-util/ccache/ccache-4.10.recipe index 533008bbf..1025a335c 100644 --- a/dev-util/ccache/ccache-4.6.recipe +++ b/dev-util/ccache/ccache-4.10.recipe @@ -9,11 +9,11 @@ LICENSE="GNU GPL v3 GNU LGPL v3" REVISION="1" SOURCE_URI="https://github.com/ccache/ccache/releases/download/v$portVersion/ccache-$portVersion.tar.xz" -CHECKSUM_SHA256="9200cafbaa5fd62c2600fccb40a18214e57747825e6cdcd76688b4b61c2dcba0" +CHECKSUM_SHA256="83630b5e922b998ab2538823e0cad962c0f956fad1fcf443dd5288269a069660" PATCHES="ccache-$portVersion.patchset" -ARCHITECTURES="?all !x86_gcc2" -SECONDARY_ARCHITECTURES="?x86" +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="x86" GLOBAL_WRITABLE_FILES="settings/ccache.conf keep-old" USER_SETTINGS_FILES="settings/ccache.conf" diff --git a/dev-util/ccache/patches/ccache-3.7.6.patchset b/dev-util/ccache/patches/ccache-3.7.6.patchset deleted file mode 100644 index bb53c2572..000000000 --- a/dev-util/ccache/patches/ccache-3.7.6.patchset +++ /dev/null @@ -1,40 +0,0 @@ -From b56152a03c956348bd6cdd7e0a00578c07d1084a Mon Sep 17 00:00:00 2001 -From: begasus -Date: Sat, 16 Jun 2018 15:19:14 +0200 -Subject: Haiku doesn't support hard links - - -diff --git a/test/suites/base.bash b/test/suites/base.bash -index 307100e..d80231e 100644 ---- a/test/suites/base.bash -+++ b/test/suites/base.bash -@@ -108,7 +108,7 @@ base_tests() { - # ------------------------------------------------------------------------- - TEST "Unsupported source language" - -- ln -f test1.c test1.ccc -+ ln -fs test1.c test1.ccc - $CCACHE_COMPILE -c test1.ccc 2>/dev/null - expect_stat 'unsupported source language' 1 - -@@ -403,7 +403,7 @@ b" - # ------------------------------------------------------------------------- - TEST "-x c" - -- ln -f test1.c test1.ccc -+ ln -fs test1.c test1.ccc - - $CCACHE_COMPILE -x c -c test1.ccc - expect_stat 'cache hit (preprocessed)' 0 -@@ -416,7 +416,7 @@ b" - # ------------------------------------------------------------------------- - TEST "-xc" - -- ln -f test1.c test1.ccc -+ ln -fs test1.c test1.ccc - - $CCACHE_COMPILE -xc -c test1.ccc - expect_stat 'cache hit (preprocessed)' 0 --- -2.16.4 - diff --git a/dev-util/ccache/patches/ccache-4.6.patchset b/dev-util/ccache/patches/ccache-4.10.patchset similarity index 56% rename from dev-util/ccache/patches/ccache-4.6.patchset rename to dev-util/ccache/patches/ccache-4.10.patchset index f8fd52cc6..cfae7ae47 100644 --- a/dev-util/ccache/patches/ccache-4.6.patchset +++ b/dev-util/ccache/patches/ccache-4.10.patchset @@ -1,14 +1,14 @@ -From 4de53076c82f6799271825d1660d822443ed6f3e Mon Sep 17 00:00:00 2001 +From 0d68f28e1dff78b7424cf072cc04536a9b6672d7 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 8cc2e6c..cd8effb 100644 +index b7eab53..8ae7b11 100644 --- a/test/suites/base.bash +++ b/test/suites/base.bash -@@ -164,7 +164,7 @@ base_tests() { +@@ -176,7 +176,7 @@ base_tests() { # ------------------------------------------------------------------------- TEST "Unsupported source language" @@ -17,7 +17,7 @@ index 8cc2e6c..cd8effb 100644 $CCACHE_COMPILE -c test1.ccc 2>/dev/null expect_stat unsupported_source_language 1 -@@ -690,7 +690,7 @@ b" +@@ -766,7 +766,7 @@ b" # ------------------------------------------------------------------------- TEST "-x c" @@ -26,7 +26,7 @@ index 8cc2e6c..cd8effb 100644 $CCACHE_COMPILE -x c -c test1.ccc expect_stat preprocessed_cache_hit 0 -@@ -703,7 +703,7 @@ b" +@@ -779,7 +779,7 @@ b" # ------------------------------------------------------------------------- TEST "-xc" @@ -36,20 +36,20 @@ index 8cc2e6c..cd8effb 100644 $CCACHE_COMPILE -xc -c test1.ccc expect_stat preprocessed_cache_hit 0 -- -2.30.2 +2.43.2 -From 95c710a986a422aa8bed385a4669b0969e18d0ec Mon Sep 17 00:00:00 2001 +From 4c9bcb77a9cd2669ea61f86a21c561895d63b56d 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 fcc2134..11e6259 100644 +index acedac4..25443eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -137,6 +137,10 @@ if(ENABLE_DOCUMENTATION) +@@ -115,6 +115,10 @@ if(ENABLE_DOCUMENTATION) add_subdirectory(doc) endif() @@ -61,5 +61,28 @@ index fcc2134..11e6259 100644 # Installation # -- -2.30.2 +2.43.2 + + +From 197a9bf13ea6c2657f0b87b58ac1de2bd968c644 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 + Config::default_temporary_dir() const + { + static const std::string 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); +-- +2.43.2