From 4e3aea796649bc6d6f24974f2dddc1cfe0af068a Mon Sep 17 00:00:00 2001 From: EWouters <6179932+EWouters@users.noreply.github.com> Date: Fri, 1 Sep 2023 18:47:17 +0200 Subject: [PATCH] Ports/ccache: Update ccache to version 4.8.3 --- Ports/AvailablePorts.md | 2 +- Ports/ccache/package.sh | 4 ++-- .../0001-Do-not-define-ESTALE-in-config.h.in.patch | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 73df60c947..c005812f30 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -34,7 +34,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n | [`carl`](carl/) | Crypto Ancienne Resource Loader | 1.5 | https://github.com/classilla/cryanc | | [`cavestory`](cavestory/) | Cave Story | 2.6.5-1 | https://github.com/nxengine/nxengine-evo | | [`cbonsai`](cbonsai/) | cbonsai | 1.3.1 | https://gitlab.com/jallbrit/cbonsai | -| [`ccache`](ccache/) | ccache | 4.6.3 | https://ccache.dev/ | +| [`ccache`](ccache/) | ccache | 4.8.3 | https://ccache.dev/ | | [`cfunge`](cfunge/) | cfunge | 2bc4fb2 | https://github.com/VorpalBlade/cfunge/ | | [`chester`](chester/) | Chester Gameboy Emulator | | https://github.com/veikkos/chester | | [`chocolate-doom`](chocolate-doom/) | Chocolate Doom | 3.0.1 | https://www.chocolate-doom.org/ | diff --git a/Ports/ccache/package.sh b/Ports/ccache/package.sh index 6606c2c0fa..dfa4698ba5 100755 --- a/Ports/ccache/package.sh +++ b/Ports/ccache/package.sh @@ -1,9 +1,9 @@ #!/usr/bin/env -S bash ../.port_include.sh port='ccache' -version='4.6.3' +version='4.8.3' useconfigure='true' files=( - "https://github.com/ccache/ccache/releases/download/v${version}/ccache-${version}.tar.gz#f46ba3706ad80c30d4d5874dee2bf9227a7fcd0ccaac31b51919a3053d84bd05" + "https://github.com/ccache/ccache/releases/download/v${version}/ccache-${version}.tar.gz#d59dd569ad2bbc826c0bc335c8ebd73e78ed0f2f40ba6b30069347e63585d9ef" ) depends=( 'zstd' diff --git a/Ports/ccache/patches/0001-Do-not-define-ESTALE-in-config.h.in.patch b/Ports/ccache/patches/0001-Do-not-define-ESTALE-in-config.h.in.patch index 60abd7309a..d3457b4f62 100644 --- a/Ports/ccache/patches/0001-Do-not-define-ESTALE-in-config.h.in.patch +++ b/Ports/ccache/patches/0001-Do-not-define-ESTALE-in-config.h.in.patch @@ -13,17 +13,17 @@ are included, but on Serenity, it breaks our definition of the 1 file changed, 4 deletions(-) diff --git a/cmake/config.h.in b/cmake/config.h.in -index 729a1d4..8aa07ca 100644 +index 2778909eab08167d505b4cda708bb177af0f9531..faea315896c47f38e17ac9eeaf1ccf005d546b7f 100644 --- a/cmake/config.h.in +++ b/cmake/config.h.in -@@ -205,10 +205,6 @@ typedef int pid_t; - # define O_BINARY 0 +@@ -202,10 +202,6 @@ typedef int pid_t; + # define O_TEXT 0 #endif -#ifndef ESTALE -# define ESTALE -1 -#endif - - #define SYSCONFDIR "@CMAKE_INSTALL_FULL_SYSCONFDIR@" + #define SYSCONFDIR "@CONFIG_SYSCONFDIR_C_ESCAPED@" #cmakedefine INODE_CACHE_SUPPORTED