From 3d25b81a39725e8e1eb8a2d6d1cbab129be3e18eaee0373b6462009cf194e9e1 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 18 Jan 2024 12:34:03 +0000 Subject: [PATCH 1/2] Accepting request 1139682 from home:dspinella:branches:devel:tools:building - Update to 4.9: * Made ignore_options/CCACHE_IGNOREOPTIONS also skip the option from special processing, similar to how --ccache-skip works. * Added support for expanding environment variables references in all configuration options. * MSVC options /Fd, /FS and /MP are no longer included in the input hash. * Made ccache terminate an ongoing compiler subprocess when terminated on all platforms, not only on Unix. * Added support for multiple -Xarch_* arguments matching -arch. * Added a debug_level/CCACHE_DEBUGLEVEL configuration option, making it possible to tell ccache to only write a log file for each compilation, not other debug files. * Added max_cache_size_kibibyte and max_files_in_cache fields in output from ccache --print-stats. * Paths after -Xclang -include are now rewritten to relative paths if base_dir/CCACHE_BASEDIR is in effect. * Added support for clang --analyze. * Improved processing of input file arguments. * Added support for st_Xtimensec fields in struct stat, thus improving behavior on some BSDs when using newly created include files. * Added support for the undocumented GCC/Clang option --include. * Ccache now exits more gracefully on invalid sharded remote storage URLs. * Made ccache bail out on too hard options -fmodules-ts, -fmodule-header, -wrapper and -Xclang -ast-dump. * Stopped relying on the st_blocks field in struct stat since it cannot be trusted for filesystems such as ZFS that do transparent compression or deduplication and adjust st_blocks some time in the future. * Fixed crash on Windows for paths with only a drive letter. * Made handling of Clang config options (such as --config-system-dir) more robust. OBS-URL: https://build.opensuse.org/request/show/1139682 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/ccache?expand=0&rev=139 --- ccache-4.8.3.tar.xz | 3 --- ccache-4.8.3.tar.xz.asc | 16 ------------- ccache-4.9.tar.xz | 3 +++ ccache-4.9.tar.xz.asc | 16 +++++++++++++ ccache.changes | 52 +++++++++++++++++++++++++++++++++++++++++ ccache.spec | 4 ++-- 6 files changed, 73 insertions(+), 21 deletions(-) delete mode 100644 ccache-4.8.3.tar.xz delete mode 100644 ccache-4.8.3.tar.xz.asc create mode 100644 ccache-4.9.tar.xz create mode 100644 ccache-4.9.tar.xz.asc diff --git a/ccache-4.8.3.tar.xz b/ccache-4.8.3.tar.xz deleted file mode 100644 index 6bf065a..0000000 --- a/ccache-4.8.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e47374c810b248cfca3665ee1d86c7c763ffd68d9944bc422d9c1872611f2b11 -size 569724 diff --git a/ccache-4.8.3.tar.xz.asc b/ccache-4.8.3.tar.xz.asc deleted file mode 100644 index a1db183..0000000 --- a/ccache-4.8.3.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEWpOacaRnks9XhmpRmW3aB1WUrbgFAmTuShQACgkQmW3aB1WU -rbhH+xAAoHog1b5AsGJEHPVM0ppX4OUsT1hjuXd993aHYTjfbZvU4OwaD5dFfQo1 -lTH2sGgcfVRNkvDjEvlNefo0301gD4PO7Xg4gr7zlETYe677S+kDCwZHYg7SfdKl -Wt05JOJuT3n2Gx5tuyxPXW6i3AEt5X3+eXKz3RhrH25a5fS0zVPrcwjkcAkxM1u1 -FwedfITmxfG24Sm0iZaVBTC79mvsiKj43KSq+R3i/BPX/YoKG34Ny5TWKcyf66u6 -XW73ZsEvqJLNjtPl7sd1aK9kE04C9zH/loA5B06hmj8WUp3zj9JBbKT0va0j5aRP -bjesFpBjurTStRi30Ksh0L5kQ9kETL14TeB4HrNH0+m7d2ODYu+ishyn9AemXgmJ -sFYzIx29rkio7Q+rhdUqL4wiAvyzynYAVlfEEsOixxBoLdnpO8yugcKKU5I3mc+e -nkIXCYHG8+guz+fPxIzN5T5EIHDLIrLFre9dOwVGzEVCKCN7yfHnOsnl/k0vjXwR -EtoVrm6GPiaAwvzLmGGErgqZ6w7XgaClgwaul9KTy+xBNEesIARi/GD2BCp9IlNv -A6Y+MzI8McjLZ0m5RR3nAURfee93uXAC2kPH6+2U25eVVE2Gil28i5UlUwYPF6A+ -2OYzC2DUSogV4r74+ordo28ZSjOgFb5hu9K4xz5ZYBJyXQne1vs= -=yL8w ------END PGP SIGNATURE----- diff --git a/ccache-4.9.tar.xz b/ccache-4.9.tar.xz new file mode 100644 index 0000000..d01a52a --- /dev/null +++ b/ccache-4.9.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ebc72324e3ab52af0b562bf54189d108e85eef6478d6304a345a3c2dc4018e0 +size 583744 diff --git a/ccache-4.9.tar.xz.asc b/ccache-4.9.tar.xz.asc new file mode 100644 index 0000000..9624cc0 --- /dev/null +++ b/ccache-4.9.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEWpOacaRnks9XhmpRmW3aB1WUrbgFAmWQMmMACgkQmW3aB1WU +rbg/KBAAr26w835t//cNuA0c2yippHIImOYjyTYgZhZ8PUnhKZdfzsXmbKRHNar5 +6tAuLao6mwUprdODYuhJVf5MjC5xnPXzVWcOMZ89Gn5sIAOgFOxySi3xftCRdCoT +opz6bsO0lgKy1BeuiGzIWlwstgmpcBQRgBH+h7Y0dn4TIGioQJH/RMMOhGsN+d9+ +FaMc04H8lnfoLXZ1V0LZEuaQJQpqJlXGlCWEwp3wVaZx98X6vGMEZEFHUCsPKEMf +LYPzF8HBARz0WkARiUwBiY9DOmPcIpTI/yzPCMqMUYRxAk+VCR7FlnCFP1gGGJlf +KmNt2/pCzFE2mYM+QHzWeayzuNF56LwBvWGdAXRH+X0wcWLcWHiILTQgn4RcrScB +lPli9NffW2W5lYj/VBa6UkFlGXpnvBFQp6TbBBnRxnH7+wiEc6RJz8YpRal+0cGT +E2LbSAnhSYYPkYJkRFZvbs8ZzRh4miUKXakCvPVNTG0KZy0ToLIhx4tI1LDIzId2 +3THi+8ZC64jsLT0GDBBU0S3K3j/UrCUrwq4r92WbvMJyLP0lbMAn8CPezvX8NGX1 +Bx3UFFfyNUWuLeSBj+WGAYVLzC59pwfre/X6zNvip/s0vZg/XkK15+NFssP7CNnL +K8C/rCocA2/GVf/bLnpC/xJCzYPSSBzr3Oq6vB1OJbUov9CdFJ8= +=3eSQ +-----END PGP SIGNATURE----- diff --git a/ccache.changes b/ccache.changes index 2b18742..167d81c 100644 --- a/ccache.changes +++ b/ccache.changes @@ -1,3 +1,55 @@ +------------------------------------------------------------------- +Thu Jan 18 10:54:53 UTC 2024 - Danilo Spinella + +- Update to 4.9: + * Made ignore_options/CCACHE_IGNOREOPTIONS also skip the option from special + processing, similar to how --ccache-skip works. + * Added support for expanding environment variables references in all + configuration options. + * MSVC options /Fd, /FS and /MP are no longer included in the input hash. + * Made ccache terminate an ongoing compiler subprocess when terminated on all + platforms, not only on Unix. + * Added support for multiple -Xarch_* arguments matching -arch. + * Added a debug_level/CCACHE_DEBUGLEVEL configuration option, making it + possible to tell ccache to only write a log file for each compilation, not + other debug files. + * Added max_cache_size_kibibyte and max_files_in_cache fields in output from + ccache --print-stats. + * Paths after -Xclang -include are now rewritten to relative paths if + base_dir/CCACHE_BASEDIR is in effect. + * Added support for clang --analyze. + * Improved processing of input file arguments. + * Added support for st_Xtimensec fields in struct stat, thus improving + behavior on some BSDs when using newly created include files. + * Added support for the undocumented GCC/Clang option --include. + * Ccache now exits more gracefully on invalid sharded remote storage URLs. + * Made ccache bail out on too hard options -fmodules-ts, -fmodule-header, + -wrapper and -Xclang -ast-dump. + * Stopped relying on the st_blocks field in struct stat since it cannot be + trusted for filesystems such as ZFS that do transparent compression or + deduplication and adjust st_blocks some time in the future. + * Fixed crash on Windows for paths with only a drive letter. + * Made handling of Clang config options (such as --config-system-dir) more + robust. + * Fixed compiler type detection when compiler is a symlink called “clang-cl”. + * Made sure to use MSVC logic for clang-cl when handling a precompiled + header. + * Generalized expansion of remote storage URLs with sharding, for instance + making it possible to shard on port number. + * Upgraded to xxHash 0.8.2, thereby fixing an error when compiling ccache + with -Og. + * Fixed sign-compare warning in src/InodeCache.cpp on FreeBSD. + * Fixed the CMake option STATIC_LINK on Linux/macOS. + * Added the CMake option OFFLINE, defaulting to the value of the standard + variable FETCHCONTENT_FULLY_DISCONNECTED (which is OFF by default), to + disable downloading anything from the internet. + * Fixed warnings about unused functions on new MSVC versions. + * Made sure to set both C and C++ CMake compiler launcher variables if either + is set. + * The manual now mentions that system_headers sloppiness is not supported for + MSVC. + * Fixed regex in direct.bash. + ------------------------------------------------------------------- Sat Oct 28 19:46:57 UTC 2023 - Andreas Stieger diff --git a/ccache.spec b/ccache.spec index a5bbb13..8b24fd2 100644 --- a/ccache.spec +++ b/ccache.spec @@ -1,7 +1,7 @@ # # spec file for package ccache # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %bcond_without hiredis Name: ccache -Version: 4.8.3 +Version: 4.9 Release: 0 Summary: A Fast C/C++ Compiler Cache License: GPL-3.0-or-later From 929379df8df9b97f13457b04541a085421f59bf5782d2ef9f884625d2455a1eb Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 19 Jan 2024 10:25:25 +0000 Subject: [PATCH 2/2] Accepting request 1139886 from home:dspinella:branches:devel:tools:building - Fix SLE build by using gcc11 and disable hiredis dependency OBS-URL: https://build.opensuse.org/request/show/1139886 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/ccache?expand=0&rev=140 --- ccache.changes | 1 + ccache.spec | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/ccache.changes b/ccache.changes index 167d81c..b5788ae 100644 --- a/ccache.changes +++ b/ccache.changes @@ -49,6 +49,7 @@ Thu Jan 18 10:54:53 UTC 2024 - Danilo Spinella * The manual now mentions that system_headers sloppiness is not supported for MSVC. * Fixed regex in direct.bash. +- Fix SLE build by using gcc11 and disable hiredis dependency ------------------------------------------------------------------- Sat Oct 28 19:46:57 UTC 2023 - Andreas Stieger diff --git a/ccache.spec b/ccache.spec index 8b24fd2..9ad3b07 100644 --- a/ccache.spec +++ b/ccache.spec @@ -16,7 +16,12 @@ # +# Build with hiredis by default only on TW +%if %{?suse_version} > 1600 %bcond_without hiredis +%else +%bcond_with hiredis +%endif Name: ccache Version: 4.9 Release: 0 @@ -27,7 +32,14 @@ Source0: https://github.com/ccache/ccache/releases/download/v%{version}/c Source1: https://github.com/ccache/ccache/releases/download/v%{version}/ccache-%{version}.tar.xz.asc Source2: %{name}.keyring BuildRequires: cmake +%if %{?suse_version} > 1600 +BuildRequires: gcc BuildRequires: gcc-c++ +# SLE requires gcc11 for std::filesystem +%else +BuildRequires: gcc11 +BuildRequires: gcc11-c++ +%endif BuildRequires: pkgconfig BuildRequires: pkgconfig(libzstd) >= 1.1.2 BuildRequires: rubygem(asciidoctor) @@ -49,6 +61,9 @@ Objective-C++. %autosetup -p1 %build +%if %{?suse_version} < 1600 +export CC=gcc-11 CXX=g++-11 +%endif %cmake \ %if !%{with hiredis} -DREDIS_STORAGE_BACKEND=OFF \