From c5796173755221e0253a1f9aaed8f582ce8cd617 Mon Sep 17 00:00:00 2001 From: SeekingBlues Date: Fri, 3 Jun 2022 16:29:18 -0500 Subject: [PATCH] Ports: Unbreak ccache --- ...-Do-not-define-ESTALE-in-config.h.in.patch | 32 +++++++++++++++++++ Ports/ccache/patches/ReadMe.md | 12 +++++++ 2 files changed, 44 insertions(+) create mode 100644 Ports/ccache/patches/0001-Do-not-define-ESTALE-in-config.h.in.patch create mode 100644 Ports/ccache/patches/ReadMe.md 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 new file mode 100644 index 0000000000..0c56598f84 --- /dev/null +++ b/Ports/ccache/patches/0001-Do-not-define-ESTALE-in-config.h.in.patch @@ -0,0 +1,32 @@ +From 0bbcd79078f4d8cb88c1738c6aae1bcc705f3ceb Mon Sep 17 00:00:00 2001 +From: SeekingBlues +Date: Fri, 3 Jun 2022 16:05:10 -0500 +Subject: [PATCH] Do not define ESTALE in config.h.in + +In ccache, `config.h` is included by the `-include` compiler option, +which means that it is included before any libc headers. This doesn't +cause any problems on systems that redefine this macro when libc headers +are included, but on Serenity, it breaks our definition of the +`ErrnoCode` enum. +--- + cmake/config.h.in | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/cmake/config.h.in b/cmake/config.h.in +index 729a1d4..8aa07ca 100644 +--- a/cmake/config.h.in ++++ b/cmake/config.h.in +@@ -205,10 +205,6 @@ typedef int pid_t; + # define O_BINARY 0 + #endif + +-#ifndef ESTALE +-# define ESTALE -1 +-#endif +- + #define SYSCONFDIR "@CMAKE_INSTALL_FULL_SYSCONFDIR@" + + #cmakedefine INODE_CACHE_SUPPORTED +-- +2.36.1 + diff --git a/Ports/ccache/patches/ReadMe.md b/Ports/ccache/patches/ReadMe.md new file mode 100644 index 0000000000..8aa8c7ec43 --- /dev/null +++ b/Ports/ccache/patches/ReadMe.md @@ -0,0 +1,12 @@ +# Patches for ccache on SerenityOS + +## `0001-Do-not-define-ESTALE-in-config.h.in.patch` + +Do not define ESTALE in config.h.in + +In ccache, `config.h` is included by the `-include` compiler option, +which means that it is included before any libc headers. This doesn't +cause any problems on systems that redefine this macro when libc headers +are included, but on Serenity, it breaks our definition of the +`ErrnoCode` enum. +