From 7e4de06e6d6d8ad55ec5613d6ab76592e62ee3cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 13:44:22 +0000 Subject: [PATCH 01/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ccache.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ccache.spec b/ccache.spec index f48241c..d88bc1d 100644 --- a/ccache.spec +++ b/ccache.spec @@ -13,7 +13,7 @@ Name: ccache Version: 3.7.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C/C++ compiler cache License: GPLv3+ @@ -215,6 +215,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 3.7.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Mar 30 2020 LuK1337 - 3.7.9-1 - Update to 3.7.9 From 3fe057131342b347c802684e80d47ba9afd2efdd Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Mon, 29 Jun 2020 21:30:28 +0200 Subject: [PATCH 02/47] Update to 3.7.11 --- ccache.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ccache.spec b/ccache.spec index f48241c..c8ca01e 100644 --- a/ccache.spec +++ b/ccache.spec @@ -12,7 +12,7 @@ %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache) Name: ccache -Version: 3.7.9 +Version: 3.7.11 Release: 1%{?dist} Summary: C/C++ compiler cache @@ -215,6 +215,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Thu Jul 30 2020 LuK1337 - 3.7.11-1 +- Update to 3.7.11 + * Mon Mar 30 2020 LuK1337 - 3.7.9-1 - Update to 3.7.9 diff --git a/sources b/sources index 80c8a0f..73de9eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ccache-3.7.9.tar.gz) = c5af4dcbd0d0b768700780ad0706abb94bffe333fa6f1801de19aa925f3d33e3206d4bd96561ed9e8ce3761dfa8a2bb380c346d1638c030b82afd8c3ce3d8817 +SHA512 (ccache-3.7.11.tar.gz) = afcd247b64f21cd62bd9a1ff99b1741f4350780db237366c3bd73b8db4acc95f553a935d12e529e82531f5cb999dbbd98d022c4447b707f5756eadcfab4901d0 From 241a0cb76ea7a7f6bfe72bde27b134a0b8cd8f4e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 00:19:33 +0000 Subject: [PATCH 03/47] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ccache.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ccache.spec b/ccache.spec index d88bc1d..79aa02f 100644 --- a/ccache.spec +++ b/ccache.spec @@ -13,7 +13,7 @@ Name: ccache Version: 3.7.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C/C++ compiler cache License: GPLv3+ @@ -215,6 +215,10 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 3.7.9-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 3.7.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From c51b18141c140c9c2cb1a506af7d30e94b3bedb1 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Fri, 7 Aug 2020 14:39:02 -0600 Subject: [PATCH 04/47] Depend on perl --- ccache.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ccache.spec b/ccache.spec index 79aa02f..3ce1e74 100644 --- a/ccache.spec +++ b/ccache.spec @@ -13,7 +13,7 @@ Name: ccache Version: 3.7.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: C/C++ compiler cache License: GPLv3+ @@ -22,7 +22,7 @@ Source0: https://github.com/ccache/ccache/releases/download/v%{version}/% Source1: %{name}.sh.in Source2: %{name}.csh.in -BuildRequires: perl(File::Spec) +BuildRequires: perl perl(File::Spec) BuildRequires: zlib-devel >= 1.2.3 # clang for additional tests BuildRequires: clang @@ -215,6 +215,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Fri Aug 07 2020 Jeff Law - 3.7.9-4 +- Depend on perl + * Sat Aug 01 2020 Fedora Release Engineering - 3.7.9-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From ab2b3dc2d7583868b564ca8d1a72825bef150e0e Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 15 Aug 2020 16:49:24 -0600 Subject: [PATCH 05/47] Update to 3.7.11 --- .gitignore | 1 + ccache.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cf5253c..1c8fedd 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /ccache-3.7.7.tar.gz /ccache-3.7.8.tar.gz /ccache-3.7.9.tar.gz +/ccache-3.7.11.tar.gz diff --git a/ccache.spec b/ccache.spec index 3ce1e74..ead7fd6 100644 --- a/ccache.spec +++ b/ccache.spec @@ -12,8 +12,8 @@ %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache) Name: ccache -Version: 3.7.9 -Release: 4%{?dist} +Version: 3.7.11 +Release: 1%{?dist} Summary: C/C++ compiler cache License: GPLv3+ @@ -215,6 +215,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Sat Aug 15 2020 Orion Poplawski - 3.7.11-1 +- Update to 3.7.11 + * Fri Aug 07 2020 Jeff Law - 3.7.9-4 - Depend on perl diff --git a/sources b/sources index 80c8a0f..73de9eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ccache-3.7.9.tar.gz) = c5af4dcbd0d0b768700780ad0706abb94bffe333fa6f1801de19aa925f3d33e3206d4bd96561ed9e8ce3761dfa8a2bb380c346d1638c030b82afd8c3ce3d8817 +SHA512 (ccache-3.7.11.tar.gz) = afcd247b64f21cd62bd9a1ff99b1741f4350780db237366c3bd73b8db4acc95f553a935d12e529e82531f5cb999dbbd98d022c4447b707f5756eadcfab4901d0 From d1960b2cb8a7755932a1cdc99332299b9940382e Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 1 Oct 2020 20:00:06 -0600 Subject: [PATCH 06/47] Update to 3.7.12 --- .gitignore | 1 + ccache.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1c8fedd..8df6779 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /ccache-3.7.8.tar.gz /ccache-3.7.9.tar.gz /ccache-3.7.11.tar.gz +/ccache-3.7.12.tar.gz diff --git a/ccache.spec b/ccache.spec index ead7fd6..0879a44 100644 --- a/ccache.spec +++ b/ccache.spec @@ -12,7 +12,7 @@ %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache) Name: ccache -Version: 3.7.11 +Version: 3.7.12 Release: 1%{?dist} Summary: C/C++ compiler cache @@ -215,6 +215,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Thu Oct 1 2020 Orion Poplawski - 3.7.12-1 +- Update to 3.7.12 + * Sat Aug 15 2020 Orion Poplawski - 3.7.11-1 - Update to 3.7.11 diff --git a/sources b/sources index 73de9eb..891ad0f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ccache-3.7.11.tar.gz) = afcd247b64f21cd62bd9a1ff99b1741f4350780db237366c3bd73b8db4acc95f553a935d12e529e82531f5cb999dbbd98d022c4447b707f5756eadcfab4901d0 +SHA512 (ccache-3.7.12.tar.gz) = 1de2dcb6568486d82b589e35f46e7f24306821545617cb9e991c1122b257d2872c1f342fd941f98777ebfd5b0b0babc45a33d824925759478f1f67370db3dd3c From a1bac92a9c6992a31c1881dac3c1ceb63976b7ca Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Tue, 27 Oct 2020 21:08:39 +0100 Subject: [PATCH 07/47] Update to 4.0 --- ccache.spec | 26 +++++++++++++++----------- sources | 2 +- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/ccache.spec b/ccache.spec index 0879a44..324c910 100644 --- a/ccache.spec +++ b/ccache.spec @@ -12,7 +12,7 @@ %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache) Name: ccache -Version: 3.7.12 +Version: 4.0 Release: 1%{?dist} Summary: C/C++ compiler cache @@ -22,10 +22,12 @@ Source0: https://github.com/ccache/ccache/releases/download/v%{version}/% Source1: %{name}.sh.in Source2: %{name}.csh.in +BuildRequires: asciidoc +BuildRequires: cmake +BuildRequires: libzstd-devel BuildRequires: perl perl(File::Spec) -BuildRequires: zlib-devel >= 1.2.3 # clang for additional tests -BuildRequires: clang +BuildRequires: clang clang-tools-extra # coreutils for triggerin, triggerpostun Requires: coreutils # For groupadd @@ -44,19 +46,20 @@ sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \ %{SOURCE1} > %{name}.sh sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \ %{SOURCE2} > %{name}.csh -# Make sure system zlib is used -rm -r src/zlib %build -%configure -make %{?_smp_mflags} +%cmake +%cmake_build +%cmake_build --target doc %install rm -rf $RPM_BUILD_ROOT -%make_install +%cmake_install + +install -Dpm 644 %{__cmake_builddir}/doc/Ccache.1 $RPM_BUILD_ROOT%{_mandir}/man1/ccache.1 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d install -pm 644 %{name}.sh %{name}.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d @@ -91,9 +94,7 @@ find $RPM_BUILD_ROOT%{_libdir}/ccache -type l | \ %check -make check -# Fails with clang 3.4.2 in EL7 -make check CC=clang %{?el7:|| :} +%ctest %define ccache_trigger(p:) \ @@ -215,6 +216,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Tue Oct 27 2020 Łukasz Patron - 4.0-1 +- Update to 4.0 + * Thu Oct 1 2020 Orion Poplawski - 3.7.12-1 - Update to 3.7.12 diff --git a/sources b/sources index 891ad0f..9bc48ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ccache-3.7.12.tar.gz) = 1de2dcb6568486d82b589e35f46e7f24306821545617cb9e991c1122b257d2872c1f342fd941f98777ebfd5b0b0babc45a33d824925759478f1f67370db3dd3c +SHA512 (ccache-4.0.tar.gz) = b87d8f2bc349f764ae77e4994409e38bbe1cbe3ecfd66e7af445c5aed28dde701cec2bc31b41cacaa20336c9299b0bb4c4a94f806e8473ceb115f591a03bbab3 From 6d2e085d4ef295f75bc2e2e1103e564f5e6903b3 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 24 Jan 2021 12:24:16 -0700 Subject: [PATCH 08/47] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 8df6779..71c3907 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /ccache-3.7.9.tar.gz /ccache-3.7.11.tar.gz /ccache-3.7.12.tar.gz +/ccache-4.0.tar.gz From 5a2b8eb5c74547241f010d05522df37045aef13f Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Sat, 2 Jan 2021 13:47:19 +0100 Subject: [PATCH 09/47] Update to 4.1 --- ccache.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ccache.spec b/ccache.spec index 324c910..425ddab 100644 --- a/ccache.spec +++ b/ccache.spec @@ -12,7 +12,7 @@ %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache) Name: ccache -Version: 4.0 +Version: 4.1 Release: 1%{?dist} Summary: C/C++ compiler cache @@ -59,7 +59,7 @@ rm -rf $RPM_BUILD_ROOT %cmake_install -install -Dpm 644 %{__cmake_builddir}/doc/Ccache.1 $RPM_BUILD_ROOT%{_mandir}/man1/ccache.1 +install -Dpm 644 %{__cmake_builddir}/doc/ccache.1 $RPM_BUILD_ROOT%{_mandir}/man1/ccache.1 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d install -pm 644 %{name}.sh %{name}.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d @@ -216,6 +216,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Sat Jan 02 2021 Łukasz Patron - 4.1-1 +- Update to 4.1 + * Tue Oct 27 2020 Łukasz Patron - 4.0-1 - Update to 4.0 diff --git a/sources b/sources index 9bc48ad..a64075e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ccache-4.0.tar.gz) = b87d8f2bc349f764ae77e4994409e38bbe1cbe3ecfd66e7af445c5aed28dde701cec2bc31b41cacaa20336c9299b0bb4c4a94f806e8473ceb115f591a03bbab3 +SHA512 (ccache-4.1.tar.gz) = 3750d1decee3bfbf2ebadc11db57e03bee5ec4ce3be75a035d795898992572f98178dca639acdd9c6e48759a1819bf8a0294126a9de58784bc9eecfb119f3423 From f86bb4a527805c049a7d6f5bd5c3531586cc0129 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 24 Jan 2021 12:27:07 -0700 Subject: [PATCH 10/47] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 71c3907..8738696 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /ccache-3.7.11.tar.gz /ccache-3.7.12.tar.gz /ccache-4.0.tar.gz +/ccache-4.1.tar.gz From 902d1537033e6d6190ea366864e0148a5b93a84f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 01:44:29 +0000 Subject: [PATCH 11/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ccache.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ccache.spec b/ccache.spec index 425ddab..d96225d 100644 --- a/ccache.spec +++ b/ccache.spec @@ -13,7 +13,7 @@ Name: ccache Version: 4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C/C++ compiler cache License: GPLv3+ @@ -216,6 +216,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Jan 02 2021 Łukasz Patron - 4.1-1 - Update to 4.1 From 567b2baa7f9e02f9995bb6511828edf426994ad0 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 2 Feb 2021 19:42:43 -0700 Subject: [PATCH 12/47] Update to 4.2 --- .gitignore | 1 + ccache.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8738696..faa8a5a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /ccache-3.7.12.tar.gz /ccache-4.0.tar.gz /ccache-4.1.tar.gz +/ccache-4.2.tar.gz diff --git a/ccache.spec b/ccache.spec index d96225d..9068e9d 100644 --- a/ccache.spec +++ b/ccache.spec @@ -12,8 +12,8 @@ %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache) Name: ccache -Version: 4.1 -Release: 2%{?dist} +Version: 4.2 +Release: 1%{?dist} Summary: C/C++ compiler cache License: GPLv3+ @@ -216,6 +216,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Wed Feb 03 2021 Orion Poplawski - 4.2-1 +- Update to 4.2 + * Tue Jan 26 2021 Fedora Release Engineering - 4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index a64075e..e7aeb70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ccache-4.1.tar.gz) = 3750d1decee3bfbf2ebadc11db57e03bee5ec4ce3be75a035d795898992572f98178dca639acdd9c6e48759a1819bf8a0294126a9de58784bc9eecfb119f3423 +SHA512 (ccache-4.2.tar.gz) = 013ae253e8613ce6d9bfc760424a36f7b70e7f003275f2d0dd6f365bcd9fc5e502fd25892f8c7f4cbf9eb0fc837f7f05baca9d2d8ba7c4dea615cab03302744b From 520cf67553880b7ad5ec04a76a3de6200d92d6d1 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 1 Apr 2021 21:41:10 -0600 Subject: [PATCH 13/47] Update to 4.2.1 --- .gitignore | 1 + ccache.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index faa8a5a..976667d 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /ccache-4.0.tar.gz /ccache-4.1.tar.gz /ccache-4.2.tar.gz +/ccache-4.2.1.tar.gz diff --git a/ccache.spec b/ccache.spec index 9068e9d..746f0e7 100644 --- a/ccache.spec +++ b/ccache.spec @@ -12,7 +12,7 @@ %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache) Name: ccache -Version: 4.2 +Version: 4.2.1 Release: 1%{?dist} Summary: C/C++ compiler cache @@ -216,6 +216,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Fri Apr 02 2021 Orion Poplawski - 4.2.1-1 +- Update to 4.2.1 + * Wed Feb 03 2021 Orion Poplawski - 4.2-1 - Update to 4.2 diff --git a/sources b/sources index e7aeb70..93697e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ccache-4.2.tar.gz) = 013ae253e8613ce6d9bfc760424a36f7b70e7f003275f2d0dd6f365bcd9fc5e502fd25892f8c7f4cbf9eb0fc837f7f05baca9d2d8ba7c4dea615cab03302744b +SHA512 (ccache-4.2.1.tar.gz) = 0e0e0de9401000be06ee1d728348dfbc70b8f228186fd065f5ae8b6100c5cebc9bae6d187a21fcb0fb0263fcfc9415832ee473ca383710bdbdb664baac6d54c2 From fc38991e1a3f2aa02d8d6a9eeb8cfe9f4c6c013d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 14:16:37 +0000 Subject: [PATCH 14/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From c7749c300167434a57698325529daa21dc0fcaa6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 19:14:02 +0000 Subject: [PATCH 15/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ccache.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ccache.spec b/ccache.spec index 746f0e7..3c107eb 100644 --- a/ccache.spec +++ b/ccache.spec @@ -13,7 +13,7 @@ Name: ccache Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C/C++ compiler cache License: GPLv3+ @@ -216,6 +216,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 4.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Apr 02 2021 Orion Poplawski - 4.2.1-1 - Update to 4.2.1 From 78add71f2109ac05b68568ff6b9becde0de6e704 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 27 Oct 2021 08:47:21 -0600 Subject: [PATCH 16/47] Update to 4.4.2 --- .gitignore | 1 + ccache.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 976667d..5308c65 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /ccache-4.1.tar.gz /ccache-4.2.tar.gz /ccache-4.2.1.tar.gz +/ccache-4.4.2.tar.gz diff --git a/ccache.spec b/ccache.spec index 3c107eb..cd6dde5 100644 --- a/ccache.spec +++ b/ccache.spec @@ -12,8 +12,8 @@ %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache) Name: ccache -Version: 4.2.1 -Release: 2%{?dist} +Version: 4.4.2 +Release: 1%{?dist} Summary: C/C++ compiler cache License: GPLv3+ @@ -22,8 +22,9 @@ Source0: https://github.com/ccache/ccache/releases/download/v%{version}/% Source1: %{name}.sh.in Source2: %{name}.csh.in -BuildRequires: asciidoc +BuildRequires: /usr/bin/asciidoctor BuildRequires: cmake +BuildRequires: hiredis-devel BuildRequires: libzstd-devel BuildRequires: perl perl(File::Spec) # clang for additional tests @@ -216,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Wed Oct 27 2021 Orion Poplawski - 4.4.2-1 +- Update to 4.4.2 + * Wed Jul 21 2021 Fedora Release Engineering - 4.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 93697e2..aedd318 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ccache-4.2.1.tar.gz) = 0e0e0de9401000be06ee1d728348dfbc70b8f228186fd065f5ae8b6100c5cebc9bae6d187a21fcb0fb0263fcfc9415832ee473ca383710bdbdb664baac6d54c2 +SHA512 (ccache-4.4.2.tar.gz) = e99f622aa79f9d7e4cc079dbbc2b12a66ff26425495af30d7db2073cad79506e839dff20aada5198d076015c98f1a04b1e70b4720016aed6163383978bb8401a From 6aabb7df35b3297e5fb6e143d26f6632456f41e9 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 5 Dec 2021 15:46:56 -0700 Subject: [PATCH 17/47] Update to 4.5.1 --- .gitignore | 1 + ccache.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5308c65..21a8290 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /ccache-4.2.tar.gz /ccache-4.2.1.tar.gz /ccache-4.4.2.tar.gz +/ccache-4.5.1.tar.gz diff --git a/ccache.spec b/ccache.spec index cd6dde5..a5034ab 100644 --- a/ccache.spec +++ b/ccache.spec @@ -12,7 +12,7 @@ %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache) Name: ccache -Version: 4.4.2 +Version: 4.5.1 Release: 1%{?dist} Summary: C/C++ compiler cache @@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Sun Dec 05 2021 Orion Poplawski - 4.5.1-1 +- Update to 4.5.1 + * Wed Oct 27 2021 Orion Poplawski - 4.4.2-1 - Update to 4.4.2 diff --git a/sources b/sources index aedd318..1f2d067 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ccache-4.4.2.tar.gz) = e99f622aa79f9d7e4cc079dbbc2b12a66ff26425495af30d7db2073cad79506e839dff20aada5198d076015c98f1a04b1e70b4720016aed6163383978bb8401a +SHA512 (ccache-4.5.1.tar.gz) = b59ea1811ea6105f4d7a844075d3e5e49ee3aadf81effacd3540bc04f786ee03f5eab4132020964609738afc2af3f0deee33f05949209a00d366c355cfb9795b From 044bc21dffd4f3acc74d9a9bc975502271e394ab Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 17 Jan 2022 13:42:48 -0800 Subject: [PATCH 18/47] Rebuild for hiredis 1.0.2 --- ccache.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ccache.spec b/ccache.spec index a5034ab..fde40e1 100644 --- a/ccache.spec +++ b/ccache.spec @@ -13,7 +13,7 @@ Name: ccache Version: 4.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C/C++ compiler cache License: GPLv3+ @@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Mon Jan 17 2022 Kevin Fenzi - 4.5.1-2 +- Rebuild for hiredis 1.0.2 + * Sun Dec 05 2021 Orion Poplawski - 4.5.1-1 - Update to 4.5.1 From 09110f3bca88a8ed371c48022632747c375955a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 22:58:37 +0000 Subject: [PATCH 19/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ccache.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ccache.spec b/ccache.spec index fde40e1..8965f87 100644 --- a/ccache.spec +++ b/ccache.spec @@ -13,7 +13,7 @@ Name: ccache Version: 4.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C/C++ compiler cache License: GPLv3+ @@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 4.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Jan 17 2022 Kevin Fenzi - 4.5.1-2 - Rebuild for hiredis 1.0.2 From 447d5e23c2d0ff2c001d6d43e584e7c58f4b7a5f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 15 May 2022 19:52:18 -0600 Subject: [PATCH 20/47] Update to 4.6.1 --- .gitignore | 1 + ccache.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 21a8290..d5bbac5 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /ccache-4.2.1.tar.gz /ccache-4.4.2.tar.gz /ccache-4.5.1.tar.gz +/ccache-4.6.1.tar.gz diff --git a/ccache.spec b/ccache.spec index 8965f87..712680d 100644 --- a/ccache.spec +++ b/ccache.spec @@ -12,8 +12,8 @@ %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache) Name: ccache -Version: 4.5.1 -Release: 3%{?dist} +Version: 4.6.1 +Release: 1%{?dist} Summary: C/C++ compiler cache License: GPLv3+ @@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Mon May 16 2022 Orion Poplawski - 4.6.1-1 +- Update to 4.6.1 + * Wed Jan 19 2022 Fedora Release Engineering - 4.5.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 1f2d067..f27d3e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ccache-4.5.1.tar.gz) = b59ea1811ea6105f4d7a844075d3e5e49ee3aadf81effacd3540bc04f786ee03f5eab4132020964609738afc2af3f0deee33f05949209a00d366c355cfb9795b +SHA512 (ccache-4.6.1.tar.gz) = 0d0603367805df0c4b909e1aab6a8c91832ca037c68d59862c7b69b067577f4bed524db6a88d798cc392433250c30e3379d2b8f26f3672371c76007db58dd8c0 From 667c5bf917bc2f86e55f5a1e2e3295149b74f706 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 22:40:03 +0000 Subject: [PATCH 21/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ccache.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ccache.spec b/ccache.spec index 712680d..08d6221 100644 --- a/ccache.spec +++ b/ccache.spec @@ -13,7 +13,7 @@ Name: ccache Version: 4.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C/C++ compiler cache License: GPLv3+ @@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 4.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon May 16 2022 Orion Poplawski - 4.6.1-1 - Update to 4.6.1 From 5d78b1089be7c24fa54b51efcdc63a05fd9a7527 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 1 Oct 2022 16:29:23 -0600 Subject: [PATCH 22/47] Update to 4.6.3 --- .gitignore | 1 + ccache.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d5bbac5..5b203db 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /ccache-4.4.2.tar.gz /ccache-4.5.1.tar.gz /ccache-4.6.1.tar.gz +/ccache-4.6.3.tar.gz diff --git a/ccache.spec b/ccache.spec index 08d6221..8c9896a 100644 --- a/ccache.spec +++ b/ccache.spec @@ -12,8 +12,8 @@ %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache) Name: ccache -Version: 4.6.1 -Release: 2%{?dist} +Version: 4.6.3 +Release: 1%{?dist} Summary: C/C++ compiler cache License: GPLv3+ @@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Sat Oct 01 2022 Orion Poplawski - 4.6.3-1 +- Update to 4.6.3 + * Wed Jul 20 2022 Fedora Release Engineering - 4.6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index f27d3e2..f7e0be1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ccache-4.6.1.tar.gz) = 0d0603367805df0c4b909e1aab6a8c91832ca037c68d59862c7b69b067577f4bed524db6a88d798cc392433250c30e3379d2b8f26f3672371c76007db58dd8c0 +SHA512 (ccache-4.6.3.tar.gz) = e6754a0c02c375745744db5bf9fe7d576d68e0068f3bb77b5abc619340daf47c536d624a1a6954df4952462c5bfe820a12796111441487525ca822b68f0b1d8b From 648295049a2465b4e3a83189f5b870cc409bf6d4 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 6 Nov 2022 20:47:07 -0700 Subject: [PATCH 23/47] Update to 4.7.3 --- .gitignore | 1 + ccache.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5b203db..028764b 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /ccache-4.5.1.tar.gz /ccache-4.6.1.tar.gz /ccache-4.6.3.tar.gz +/ccache-4.7.3.tar.gz diff --git a/ccache.spec b/ccache.spec index 8c9896a..8744ba3 100644 --- a/ccache.spec +++ b/ccache.spec @@ -12,7 +12,7 @@ %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache) Name: ccache -Version: 4.6.3 +Version: 4.7.3 Release: 1%{?dist} Summary: C/C++ compiler cache @@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Mon Nov 07 2022 Orion Poplawski - 4.7.3-1 +- Update to 4.7.3 + * Sat Oct 01 2022 Orion Poplawski - 4.6.3-1 - Update to 4.6.3 diff --git a/sources b/sources index f7e0be1..4108bd2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ccache-4.6.3.tar.gz) = e6754a0c02c375745744db5bf9fe7d576d68e0068f3bb77b5abc619340daf47c536d624a1a6954df4952462c5bfe820a12796111441487525ca822b68f0b1d8b +SHA512 (ccache-4.7.3.tar.gz) = 9839c0f1eef60136b6f55e04971e732dc25066f74777cf008bc7fe669b0c2e74ced8664bcaab0e0f035f12eff583a592a853eb57abfff62fc97b0e14f0a144f0 From 76f17c59b1025fb1b182270383e1c798b352f869 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 9 Dec 2022 20:06:57 -0700 Subject: [PATCH 24/47] Update to 4.7.4 --- .gitignore | 1 + ccache.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 028764b..bdbc7ad 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /ccache-4.6.1.tar.gz /ccache-4.6.3.tar.gz /ccache-4.7.3.tar.gz +/ccache-4.7.4.tar.gz diff --git a/ccache.spec b/ccache.spec index 8744ba3..f1e356c 100644 --- a/ccache.spec +++ b/ccache.spec @@ -12,7 +12,7 @@ %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache) Name: ccache -Version: 4.7.3 +Version: 4.7.4 Release: 1%{?dist} Summary: C/C++ compiler cache @@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Sat Dec 10 2022 Orion Poplawski - 4.7.4-1 +- Update to 4.7.4 + * Mon Nov 07 2022 Orion Poplawski - 4.7.3-1 - Update to 4.7.3 diff --git a/sources b/sources index 4108bd2..1ecbb4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ccache-4.7.3.tar.gz) = 9839c0f1eef60136b6f55e04971e732dc25066f74777cf008bc7fe669b0c2e74ced8664bcaab0e0f035f12eff583a592a853eb57abfff62fc97b0e14f0a144f0 +SHA512 (ccache-4.7.4.tar.gz) = 58faceb3d3b566d53000ac81bf27a52502ff3cb163f29506eccb7831bfcfdde3601102fe8b57530b8900e1d5e050374364c4df3c88ff825f0132e94b90441de9 From 13918638390b52772d1e84d52454cbbd40579d22 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 23:35:44 +0000 Subject: [PATCH 25/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ccache.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ccache.spec b/ccache.spec index f1e356c..77e7f95 100644 --- a/ccache.spec +++ b/ccache.spec @@ -13,7 +13,7 @@ Name: ccache Version: 4.7.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C/C++ compiler cache License: GPLv3+ @@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 4.7.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Dec 10 2022 Orion Poplawski - 4.7.4-1 - Update to 4.7.4 From 5762ce643cdd27df705a30b5bd26657ed3041863 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 21 Mar 2023 19:39:31 -0600 Subject: [PATCH 26/47] Update to 4.7.5 --- .gitignore | 1 + ccache.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bdbc7ad..21e48e0 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /ccache-4.6.3.tar.gz /ccache-4.7.3.tar.gz /ccache-4.7.4.tar.gz +/ccache-4.7.5.tar.gz diff --git a/ccache.spec b/ccache.spec index 77e7f95..fda40fa 100644 --- a/ccache.spec +++ b/ccache.spec @@ -12,8 +12,8 @@ %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache) Name: ccache -Version: 4.7.4 -Release: 2%{?dist} +Version: 4.7.5 +Release: 1%{?dist} Summary: C/C++ compiler cache License: GPLv3+ @@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Wed Mar 22 2023 Orion Poplawski - 4.7.5-1 +- Update to 4.7.5 + * Wed Jan 18 2023 Fedora Release Engineering - 4.7.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 1ecbb4b..7c6a36b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ccache-4.7.4.tar.gz) = 58faceb3d3b566d53000ac81bf27a52502ff3cb163f29506eccb7831bfcfdde3601102fe8b57530b8900e1d5e050374364c4df3c88ff825f0132e94b90441de9 +SHA512 (ccache-4.7.5.tar.gz) = 49c3e8877d8dc4f5cb58f8d67d9d14c2009a23e21b45a9f367ebc58f7acc74d0a4b39de32d9a20642ad145a867b255230e101d6c90b8f98da8be8b698accd5a9 From bad1f3b08679fcd5ef23dce6522648e67f9afb18 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 5 Apr 2023 20:55:25 -0600 Subject: [PATCH 27/47] Update to 4.8 (fixes bz#2160275) --- .gitignore | 1 + ccache.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 21e48e0..2383c47 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /ccache-4.7.3.tar.gz /ccache-4.7.4.tar.gz /ccache-4.7.5.tar.gz +/ccache-4.8.tar.gz diff --git a/ccache.spec b/ccache.spec index fda40fa..8d27fff 100644 --- a/ccache.spec +++ b/ccache.spec @@ -12,7 +12,7 @@ %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache) Name: ccache -Version: 4.7.5 +Version: 4.8 Release: 1%{?dist} Summary: C/C++ compiler cache @@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Wed Apr 05 2023 Orion Poplawski - 4.8-1 +- Update to 4.8 (fixes bz#2160275) + * Wed Mar 22 2023 Orion Poplawski - 4.7.5-1 - Update to 4.7.5 diff --git a/sources b/sources index 7c6a36b..67ee807 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ccache-4.7.5.tar.gz) = 49c3e8877d8dc4f5cb58f8d67d9d14c2009a23e21b45a9f367ebc58f7acc74d0a4b39de32d9a20642ad145a867b255230e101d6c90b8f98da8be8b698accd5a9 +SHA512 (ccache-4.8.tar.gz) = d4880e8e176c4a22a088dd0c35e20f19c9c3134292b18183e7e87f32ebb4adb523831479d8c67fa8c50de8ec0b95ab956c612e2c525de58ba175a756264a9d08 From dafdc69b15089576e600119ea35bdb28ca7264f6 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 16 Jun 2023 07:44:13 -0600 Subject: [PATCH 28/47] Update to 4.8.2 --- .gitignore | 1 + ccache.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2383c47..9159c6c 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /ccache-4.7.4.tar.gz /ccache-4.7.5.tar.gz /ccache-4.8.tar.gz +/ccache-4.8.2.tar.gz diff --git a/ccache.spec b/ccache.spec index 8d27fff..233e204 100644 --- a/ccache.spec +++ b/ccache.spec @@ -12,7 +12,7 @@ %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache) Name: ccache -Version: 4.8 +Version: 4.8.2 Release: 1%{?dist} Summary: C/C++ compiler cache @@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Fri Jun 16 2023 Orion Poplawski - 4.8.2-1 +- Update to 4.8.2 + * Wed Apr 05 2023 Orion Poplawski - 4.8-1 - Update to 4.8 (fixes bz#2160275) diff --git a/sources b/sources index 67ee807..ab6a16a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ccache-4.8.tar.gz) = d4880e8e176c4a22a088dd0c35e20f19c9c3134292b18183e7e87f32ebb4adb523831479d8c67fa8c50de8ec0b95ab956c612e2c525de58ba175a756264a9d08 +SHA512 (ccache-4.8.2.tar.gz) = 61841b2ae307d99aeae2a21be66f56fa58f72b56a51c830f686218c03e04314757b7d38af4ac501a8280c9a67b0ca0f95ffc53b19543957d103223f990b97d4c From 5afc22e5d71d39296cbf7e1754efdc177eddd712 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 15:23:29 +0000 Subject: [PATCH 29/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ccache.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ccache.spec b/ccache.spec index 233e204..28cbc7d 100644 --- a/ccache.spec +++ b/ccache.spec @@ -13,7 +13,7 @@ Name: ccache Version: 4.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C/C++ compiler cache License: GPLv3+ @@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 4.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jun 16 2023 Orion Poplawski - 4.8.2-1 - Update to 4.8.2 From 60cfed36015ca588b6e1577bddf14b3f0b87a006 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 1 Sep 2023 17:57:34 -0600 Subject: [PATCH 30/47] Update to 4.8.3 --- .gitignore | 1 + ccache.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9159c6c..fb9bf0c 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /ccache-4.7.5.tar.gz /ccache-4.8.tar.gz /ccache-4.8.2.tar.gz +/ccache-4.8.3.tar.gz diff --git a/ccache.spec b/ccache.spec index 28cbc7d..5e4d54f 100644 --- a/ccache.spec +++ b/ccache.spec @@ -12,8 +12,8 @@ %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache) Name: ccache -Version: 4.8.2 -Release: 2%{?dist} +Version: 4.8.3 +Release: 1%{?dist} Summary: C/C++ compiler cache License: GPLv3+ @@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Fri Sep 01 2023 Orion Poplawski - 4.8.3-1 +- Update to 4.8.3 + * Wed Jul 19 2023 Fedora Release Engineering - 4.8.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index ab6a16a..ea72bbd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ccache-4.8.2.tar.gz) = 61841b2ae307d99aeae2a21be66f56fa58f72b56a51c830f686218c03e04314757b7d38af4ac501a8280c9a67b0ca0f95ffc53b19543957d103223f990b97d4c +SHA512 (ccache-4.8.3.tar.gz) = 65c870c25dff1a88c92b99e697312fcc2d61f6718fc1f20203ac2bc16975ff376d943bdb4462716a5b2d84081502fb18a93caac7739f75f37f3acc66fa468498 From 0f8218cb77555fd986f05e359f0ca4c4d4769916 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 15:09:31 +0000 Subject: [PATCH 31/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ccache.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ccache.spec b/ccache.spec index 5e4d54f..a8096be 100644 --- a/ccache.spec +++ b/ccache.spec @@ -13,7 +13,7 @@ Name: ccache Version: 4.8.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C/C++ compiler cache License: GPLv3+ @@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 4.8.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Sep 01 2023 Orion Poplawski - 4.8.3-1 - Update to 4.8.3 From c300ebc9d59791e94371edae7284f34191cfea78 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 23 Jan 2024 01:19:10 +0000 Subject: [PATCH 32/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ccache.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ccache.spec b/ccache.spec index a8096be..1d3ffed 100644 --- a/ccache.spec +++ b/ccache.spec @@ -13,7 +13,7 @@ Name: ccache Version: 4.8.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C/C++ compiler cache License: GPLv3+ @@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Tue Jan 23 2024 Fedora Release Engineering - 4.8.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 4.8.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From bd1676367fa1e85580ec493d5b3a51a44b9415e5 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 5 Feb 2024 09:42:45 -0700 Subject: [PATCH 33/47] Update to 4.9.1 Use SPDX license, and license for bundled libraries Unbundle libraries Add bundled provides --- .gitignore | 2 + ccache-unbundle.patch | 182 ++++++++++++++++++++++++++++++++++++++++++ ccache.spec | 35 ++++++-- sources | 2 +- 4 files changed, 215 insertions(+), 6 deletions(-) create mode 100644 ccache-unbundle.patch diff --git a/.gitignore b/.gitignore index fb9bf0c..be4f5f7 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ /ccache-4.8.tar.gz /ccache-4.8.2.tar.gz /ccache-4.8.3.tar.gz +/ccache-4.9.tar.gz +/ccache-4.9.1.tar.gz diff --git a/ccache-unbundle.patch b/ccache-unbundle.patch new file mode 100644 index 0000000..3c85c02 --- /dev/null +++ b/ccache-unbundle.patch @@ -0,0 +1,182 @@ +diff -up ccache-4.9.1/CMakeLists.txt.unbundle ccache-4.9.1/CMakeLists.txt +--- ccache-4.9.1/CMakeLists.txt.unbundle 2024-02-05 12:29:52.000000000 -0700 ++++ ccache-4.9.1/CMakeLists.txt 2024-02-08 08:24:25.196673454 -0700 +@@ -86,6 +86,10 @@ include(GenerateVersionFile) + # Third party + # + ++find_package(PkgConfig REQUIRED) ++ ++pkg_check_modules(xxhash REQUIRED IMPORTED_TARGET libxxhash) ++ + set(ZSTD_FROM_INTERNET AUTO CACHE STRING "Download and use libzstd from the Internet") + set_property(CACHE ZSTD_FROM_INTERNET PROPERTY STRINGS AUTO ON OFF) + +diff -up ccache-4.9.1/src/CMakeLists.txt.unbundle ccache-4.9.1/src/CMakeLists.txt +--- ccache-4.9.1/src/CMakeLists.txt.unbundle 2024-02-05 12:29:52.000000000 -0700 ++++ ccache-4.9.1/src/CMakeLists.txt 2024-02-08 08:27:10.324913588 -0700 +@@ -14,6 +14,7 @@ set( + hashutil.cpp + language.cpp + version.cpp ++ third_party/url.cpp + ) + + if(INODE_CACHE_SUPPORTED) +@@ -45,10 +46,11 @@ if(CCACHE_EXTRA_LIBS) + endif() + + set(THREADS_PREFER_PTHREAD_FLAG ON) ++find_package(fmt REQUIRED) + find_package(Threads REQUIRED) + target_link_libraries( + ccache_framework +- PRIVATE standard_settings standard_warnings ZSTD::ZSTD Threads::Threads third_party ++ PRIVATE standard_settings standard_warnings blake3 fmt::fmt ZSTD::ZSTD Threads::Threads PkgConfig::xxhash + ) + + target_include_directories(ccache_framework PUBLIC ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) +@@ -57,7 +59,7 @@ if(REDIS_STORAGE_BACKEND) + target_compile_definitions(ccache_framework PUBLIC -DHAVE_REDIS_STORAGE_BACKEND) + target_link_libraries( + ccache_framework +- PUBLIC standard_settings standard_warnings HIREDIS::HIREDIS third_party ++ PUBLIC standard_settings standard_warnings HIREDIS::HIREDIS + ) + endif() + +diff -up ccache-4.9.1/src/hashutil.cpp.unbundle ccache-4.9.1/src/hashutil.cpp +--- ccache-4.9.1/src/hashutil.cpp.unbundle 2024-02-05 12:29:52.000000000 -0700 ++++ ccache-4.9.1/src/hashutil.cpp 2024-02-08 08:24:25.200673484 -0700 +@@ -37,7 +37,9 @@ + # include "InodeCache.hpp" + #endif + +-#include "third_party/blake3/blake3_cpu_supports_avx2.h" ++#ifdef HAVE_AVX2 ++# include "third_party/blake3/blake3_cpu_supports_avx2.h" ++#endif + + #ifdef HAVE_UNISTD_H + # include +diff -up ccache-4.9.1/src/third_party/CMakeLists.txt.unbundle ccache-4.9.1/src/third_party/CMakeLists.txt +--- ccache-4.9.1/src/third_party/CMakeLists.txt.unbundle 2024-02-05 12:29:52.000000000 -0700 ++++ ccache-4.9.1/src/third_party/CMakeLists.txt 2024-02-08 08:26:04.233417232 -0700 +@@ -1,58 +1,59 @@ +-add_library(third_party STATIC format.cpp httplib.cpp url.cpp xxhash.c) +-if(NOT MSVC) +- target_sources(third_party PRIVATE getopt_long.c) +-else() +- target_sources(third_party PRIVATE win32/getopt.c) +- target_compile_definitions(third_party PUBLIC -DSTATIC_GETOPT) +-endif() ++if(0) ++ add_library(third_party STATIC format.cpp httplib.cpp url.cpp xxhash.c) ++ if(NOT MSVC) ++ target_sources(third_party PRIVATE getopt_long.c) ++ else() ++ target_sources(third_party PRIVATE win32/getopt.c) ++ target_compile_definitions(third_party PUBLIC -DSTATIC_GETOPT) ++ endif() ++ file(GLOB headers *.h fmt/*.h nonstd/*.hpp) ++ target_sources(third_party PRIVATE ${headers}) ++ ++ set(xxhdispatchtest [=[ ++ #include "xxh_x86dispatch.c" ++ ++ int main() ++ { ++ XXH3_64bits_dispatch("foo", 3); ++ return 1; ++ } ++ ]=]) ++ ++ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/xxhdispatchtest.c" "${xxhdispatchtest}") ++ ++ try_compile(USE_XXH_DISPATCH ${CMAKE_CURRENT_BINARY_DIR} ++ "${CMAKE_CURRENT_BINARY_DIR}/xxhdispatchtest.c" ++ CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${CMAKE_CURRENT_SOURCE_DIR}" ++ COMPILE_DEFINITIONS "-DXXH_STATIC_LINKING_ONLY") ++ ++ target_compile_definitions(third_party INTERFACE "-DXXH_STATIC_LINKING_ONLY") ++ if(USE_XXH_DISPATCH) ++ target_sources(third_party PRIVATE xxh_x86dispatch.c) ++ target_compile_definitions(third_party INTERFACE "-DUSE_XXH_DISPATCH") ++ endif() ++ ++ # Treat third party headers as system files (no warning for those headers). ++ target_include_directories( ++ third_party ++ PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} SYSTEM ++ ) ++ ++ target_link_libraries(third_party PRIVATE standard_settings) ++endif () ++ + + if(WIN32) + target_sources(third_party PRIVATE win32/mktemp.c) ++ file(GLOB headers win32/*.h) ++ target_sources(third_party PRIVATE ${headers}) ++ ++ target_link_libraries(third_party PRIVATE ws2_32) + endif () + + if(ENABLE_TRACING) + target_sources(third_party PRIVATE minitrace.c) + endif() + +-file(GLOB headers *.h fmt/*.h nonstd/*.hpp win32/*.h) +-target_sources(third_party PRIVATE ${headers}) +- +-set(xxhdispatchtest [=[ +-#include "xxh_x86dispatch.c" +- +-int main() +-{ +- XXH3_64bits_dispatch("foo", 3); +- return 1; +-} +-]=]) +- +-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/xxhdispatchtest.c" "${xxhdispatchtest}") +- +-try_compile(USE_XXH_DISPATCH ${CMAKE_CURRENT_BINARY_DIR} +- "${CMAKE_CURRENT_BINARY_DIR}/xxhdispatchtest.c" +- CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${CMAKE_CURRENT_SOURCE_DIR}" +- COMPILE_DEFINITIONS "-DXXH_STATIC_LINKING_ONLY") +- +-target_compile_definitions(third_party INTERFACE "-DXXH_STATIC_LINKING_ONLY") +-if(USE_XXH_DISPATCH) +- target_sources(third_party PRIVATE xxh_x86dispatch.c) +- target_compile_definitions(third_party INTERFACE "-DUSE_XXH_DISPATCH") +-endif() +- +-# Treat third party headers as system files (no warning for those headers). +-target_include_directories( +- third_party +- PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} SYSTEM +-) +- +-target_link_libraries(third_party PRIVATE standard_settings) +-target_link_libraries(third_party INTERFACE blake3) +- +-if(WIN32) +- target_link_libraries(third_party PRIVATE ws2_32) +-endif() +- + # Silence warning from winbase.h due to /Zc:preprocessor. + if(MSVC) + target_compile_options(third_party PRIVATE /wd5105) +diff -up ccache-4.9.1/unittest/CMakeLists.txt.unbundle ccache-4.9.1/unittest/CMakeLists.txt +--- ccache-4.9.1/unittest/CMakeLists.txt.unbundle 2024-02-05 12:29:52.000000000 -0700 ++++ ccache-4.9.1/unittest/CMakeLists.txt 2024-02-08 08:24:25.196673454 -0700 +@@ -59,7 +59,7 @@ endif() + + target_link_libraries( + unittest +- PRIVATE standard_settings standard_warnings ccache_framework third_party) ++ PRIVATE standard_settings standard_warnings ccache_framework PkgConfig::xxhash) + + target_include_directories(unittest PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${ccache_SOURCE_DIR}/src) + diff --git a/ccache.spec b/ccache.spec index 1d3ffed..83c2a97 100644 --- a/ccache.spec +++ b/ccache.spec @@ -12,27 +12,43 @@ %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache) Name: ccache -Version: 4.8.3 -Release: 3%{?dist} +Version: 4.9.1 +Release: 1%{?dist} Summary: C/C++ compiler cache -License: GPLv3+ +# See LICENSE.adoc for licenses of bundled codes +# blake3 is Apache-2.0 +# minitrace.h is MIT +# span.hpp is BSL-1.0 +# url.cpp/hpp is MIT +License: GPL-3.0-or-later AND Apache-2.0 AND BSL-1.0 AND MIT URL: http://ccache.dev/ Source0: https://github.com/ccache/ccache/releases/download/v%{version}/%{name}-%{version}.tar.gz Source1: %{name}.sh.in Source2: %{name}.csh.in +Patch1: ccache-unbundle.patch BuildRequires: /usr/bin/asciidoctor BuildRequires: cmake +# Uses a patched version and is missing on i686 in Fedora +#BuildRequires: blake3-devel +BuildRequires: cpp-httplib-devel +BuildRequires: doctest-devel +BuildRequires: expected-devel +BuildRequires: fmt-devel BuildRequires: hiredis-devel BuildRequires: libzstd-devel BuildRequires: perl perl(File::Spec) +BuildRequires: xxhash-devel # clang for additional tests BuildRequires: clang clang-tools-extra # coreutils for triggerin, triggerpostun Requires: coreutils # For groupadd Requires(pre): shadow-utils +Provides: bundled(blake3) = 1.5.0 +Provides: bundled(span-lite) = 0.10.3 +Provides: bundled(cxxurl) %description ccache is a compiler cache. It speeds up recompilation of C/C++ code @@ -43,6 +59,11 @@ being done again. The main focus is to handle the GNU C/C++ compiler %prep %setup -q +%patch -P1 -p1 -b .unbundle +find -name \*.[hc]pp \ + -exec sed -i -E -e 's,third_party/(fmt/|httplib.h|tl/expected.hpp|xxhash.h),\1,' \ + -e 's,third_party/doctest.h,doctest/doctest.h,' {} + +rm -r src/third_party/[ac-lo-tv-z]* src/third_party/minitrace.c sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \ %{SOURCE1} > %{name}.sh sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \ @@ -56,8 +77,6 @@ sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \ %install -rm -rf $RPM_BUILD_ROOT - %cmake_install install -Dpm 644 %{__cmake_builddir}/doc/ccache.1 $RPM_BUILD_ROOT%{_mandir}/man1/ccache.1 @@ -217,6 +236,12 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Tue Feb 06 2024 Orion Poplawski - 4.9.1-1 +- Update to 4.9.1 +- Unbundle some libraries +- Use SPDX license +- Add licenses for bundled code + * Tue Jan 23 2024 Fedora Release Engineering - 4.8.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index ea72bbd..bcee6d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ccache-4.8.3.tar.gz) = 65c870c25dff1a88c92b99e697312fcc2d61f6718fc1f20203ac2bc16975ff376d943bdb4462716a5b2d84081502fb18a93caac7739f75f37f3acc66fa468498 +SHA512 (ccache-4.9.1.tar.gz) = 0945d46aaa8f76098356bed0a1258d1c8b19564247acc34ca3d71e0bd12e7edf095ad43e23c7459c8174be8ca6569c671da09a864edc57b77113bc1d5602cd28 From 59331031eb2823b4777829ee270f76a21cb81720 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 11 May 2024 15:41:48 -0700 Subject: [PATCH 34/47] rebuild for hiredis soname bump --- ccache.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ccache.spec b/ccache.spec index 83c2a97..87f473b 100644 --- a/ccache.spec +++ b/ccache.spec @@ -13,7 +13,7 @@ Name: ccache Version: 4.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C/C++ compiler cache # See LICENSE.adoc for licenses of bundled codes @@ -236,6 +236,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Sat May 11 2024 Kevin Fenzi - 4.9.1-2 +- rebuild for hiredis soname bump + * Tue Feb 06 2024 Orion Poplawski - 4.9.1-1 - Update to 4.9.1 - Unbundle some libraries From 3454728c01de0fd492398b677c21e91202858a4b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 2 Jun 2024 17:44:40 -0600 Subject: [PATCH 35/47] Update to. 4.10 --- .gitignore | 1 + ccache-unbundle.patch | 182 ------------------------------------------ ccache.spec | 20 +++-- sources | 2 +- 4 files changed, 11 insertions(+), 194 deletions(-) delete mode 100644 ccache-unbundle.patch diff --git a/.gitignore b/.gitignore index be4f5f7..9b59100 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /ccache-4.8.3.tar.gz /ccache-4.9.tar.gz /ccache-4.9.1.tar.gz +/ccache-4.10.tar.gz diff --git a/ccache-unbundle.patch b/ccache-unbundle.patch deleted file mode 100644 index 3c85c02..0000000 --- a/ccache-unbundle.patch +++ /dev/null @@ -1,182 +0,0 @@ -diff -up ccache-4.9.1/CMakeLists.txt.unbundle ccache-4.9.1/CMakeLists.txt ---- ccache-4.9.1/CMakeLists.txt.unbundle 2024-02-05 12:29:52.000000000 -0700 -+++ ccache-4.9.1/CMakeLists.txt 2024-02-08 08:24:25.196673454 -0700 -@@ -86,6 +86,10 @@ include(GenerateVersionFile) - # Third party - # - -+find_package(PkgConfig REQUIRED) -+ -+pkg_check_modules(xxhash REQUIRED IMPORTED_TARGET libxxhash) -+ - set(ZSTD_FROM_INTERNET AUTO CACHE STRING "Download and use libzstd from the Internet") - set_property(CACHE ZSTD_FROM_INTERNET PROPERTY STRINGS AUTO ON OFF) - -diff -up ccache-4.9.1/src/CMakeLists.txt.unbundle ccache-4.9.1/src/CMakeLists.txt ---- ccache-4.9.1/src/CMakeLists.txt.unbundle 2024-02-05 12:29:52.000000000 -0700 -+++ ccache-4.9.1/src/CMakeLists.txt 2024-02-08 08:27:10.324913588 -0700 -@@ -14,6 +14,7 @@ set( - hashutil.cpp - language.cpp - version.cpp -+ third_party/url.cpp - ) - - if(INODE_CACHE_SUPPORTED) -@@ -45,10 +46,11 @@ if(CCACHE_EXTRA_LIBS) - endif() - - set(THREADS_PREFER_PTHREAD_FLAG ON) -+find_package(fmt REQUIRED) - find_package(Threads REQUIRED) - target_link_libraries( - ccache_framework -- PRIVATE standard_settings standard_warnings ZSTD::ZSTD Threads::Threads third_party -+ PRIVATE standard_settings standard_warnings blake3 fmt::fmt ZSTD::ZSTD Threads::Threads PkgConfig::xxhash - ) - - target_include_directories(ccache_framework PUBLIC ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) -@@ -57,7 +59,7 @@ if(REDIS_STORAGE_BACKEND) - target_compile_definitions(ccache_framework PUBLIC -DHAVE_REDIS_STORAGE_BACKEND) - target_link_libraries( - ccache_framework -- PUBLIC standard_settings standard_warnings HIREDIS::HIREDIS third_party -+ PUBLIC standard_settings standard_warnings HIREDIS::HIREDIS - ) - endif() - -diff -up ccache-4.9.1/src/hashutil.cpp.unbundle ccache-4.9.1/src/hashutil.cpp ---- ccache-4.9.1/src/hashutil.cpp.unbundle 2024-02-05 12:29:52.000000000 -0700 -+++ ccache-4.9.1/src/hashutil.cpp 2024-02-08 08:24:25.200673484 -0700 -@@ -37,7 +37,9 @@ - # include "InodeCache.hpp" - #endif - --#include "third_party/blake3/blake3_cpu_supports_avx2.h" -+#ifdef HAVE_AVX2 -+# include "third_party/blake3/blake3_cpu_supports_avx2.h" -+#endif - - #ifdef HAVE_UNISTD_H - # include -diff -up ccache-4.9.1/src/third_party/CMakeLists.txt.unbundle ccache-4.9.1/src/third_party/CMakeLists.txt ---- ccache-4.9.1/src/third_party/CMakeLists.txt.unbundle 2024-02-05 12:29:52.000000000 -0700 -+++ ccache-4.9.1/src/third_party/CMakeLists.txt 2024-02-08 08:26:04.233417232 -0700 -@@ -1,58 +1,59 @@ --add_library(third_party STATIC format.cpp httplib.cpp url.cpp xxhash.c) --if(NOT MSVC) -- target_sources(third_party PRIVATE getopt_long.c) --else() -- target_sources(third_party PRIVATE win32/getopt.c) -- target_compile_definitions(third_party PUBLIC -DSTATIC_GETOPT) --endif() -+if(0) -+ add_library(third_party STATIC format.cpp httplib.cpp url.cpp xxhash.c) -+ if(NOT MSVC) -+ target_sources(third_party PRIVATE getopt_long.c) -+ else() -+ target_sources(third_party PRIVATE win32/getopt.c) -+ target_compile_definitions(third_party PUBLIC -DSTATIC_GETOPT) -+ endif() -+ file(GLOB headers *.h fmt/*.h nonstd/*.hpp) -+ target_sources(third_party PRIVATE ${headers}) -+ -+ set(xxhdispatchtest [=[ -+ #include "xxh_x86dispatch.c" -+ -+ int main() -+ { -+ XXH3_64bits_dispatch("foo", 3); -+ return 1; -+ } -+ ]=]) -+ -+ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/xxhdispatchtest.c" "${xxhdispatchtest}") -+ -+ try_compile(USE_XXH_DISPATCH ${CMAKE_CURRENT_BINARY_DIR} -+ "${CMAKE_CURRENT_BINARY_DIR}/xxhdispatchtest.c" -+ CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${CMAKE_CURRENT_SOURCE_DIR}" -+ COMPILE_DEFINITIONS "-DXXH_STATIC_LINKING_ONLY") -+ -+ target_compile_definitions(third_party INTERFACE "-DXXH_STATIC_LINKING_ONLY") -+ if(USE_XXH_DISPATCH) -+ target_sources(third_party PRIVATE xxh_x86dispatch.c) -+ target_compile_definitions(third_party INTERFACE "-DUSE_XXH_DISPATCH") -+ endif() -+ -+ # Treat third party headers as system files (no warning for those headers). -+ target_include_directories( -+ third_party -+ PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} SYSTEM -+ ) -+ -+ target_link_libraries(third_party PRIVATE standard_settings) -+endif () -+ - - if(WIN32) - target_sources(third_party PRIVATE win32/mktemp.c) -+ file(GLOB headers win32/*.h) -+ target_sources(third_party PRIVATE ${headers}) -+ -+ target_link_libraries(third_party PRIVATE ws2_32) - endif () - - if(ENABLE_TRACING) - target_sources(third_party PRIVATE minitrace.c) - endif() - --file(GLOB headers *.h fmt/*.h nonstd/*.hpp win32/*.h) --target_sources(third_party PRIVATE ${headers}) -- --set(xxhdispatchtest [=[ --#include "xxh_x86dispatch.c" -- --int main() --{ -- XXH3_64bits_dispatch("foo", 3); -- return 1; --} --]=]) -- --file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/xxhdispatchtest.c" "${xxhdispatchtest}") -- --try_compile(USE_XXH_DISPATCH ${CMAKE_CURRENT_BINARY_DIR} -- "${CMAKE_CURRENT_BINARY_DIR}/xxhdispatchtest.c" -- CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${CMAKE_CURRENT_SOURCE_DIR}" -- COMPILE_DEFINITIONS "-DXXH_STATIC_LINKING_ONLY") -- --target_compile_definitions(third_party INTERFACE "-DXXH_STATIC_LINKING_ONLY") --if(USE_XXH_DISPATCH) -- target_sources(third_party PRIVATE xxh_x86dispatch.c) -- target_compile_definitions(third_party INTERFACE "-DUSE_XXH_DISPATCH") --endif() -- --# Treat third party headers as system files (no warning for those headers). --target_include_directories( -- third_party -- PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} SYSTEM --) -- --target_link_libraries(third_party PRIVATE standard_settings) --target_link_libraries(third_party INTERFACE blake3) -- --if(WIN32) -- target_link_libraries(third_party PRIVATE ws2_32) --endif() -- - # Silence warning from winbase.h due to /Zc:preprocessor. - if(MSVC) - target_compile_options(third_party PRIVATE /wd5105) -diff -up ccache-4.9.1/unittest/CMakeLists.txt.unbundle ccache-4.9.1/unittest/CMakeLists.txt ---- ccache-4.9.1/unittest/CMakeLists.txt.unbundle 2024-02-05 12:29:52.000000000 -0700 -+++ ccache-4.9.1/unittest/CMakeLists.txt 2024-02-08 08:24:25.196673454 -0700 -@@ -59,7 +59,7 @@ endif() - - target_link_libraries( - unittest -- PRIVATE standard_settings standard_warnings ccache_framework third_party) -+ PRIVATE standard_settings standard_warnings ccache_framework PkgConfig::xxhash) - - target_include_directories(unittest PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${ccache_SOURCE_DIR}/src) - diff --git a/ccache.spec b/ccache.spec index 87f473b..4acab09 100644 --- a/ccache.spec +++ b/ccache.spec @@ -12,13 +12,12 @@ %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache) Name: ccache -Version: 4.9.1 -Release: 2%{?dist} +Version: 4.10 +Release: 1%{?dist} Summary: C/C++ compiler cache # See LICENSE.adoc for licenses of bundled codes # blake3 is Apache-2.0 -# minitrace.h is MIT # span.hpp is BSL-1.0 # url.cpp/hpp is MIT License: GPL-3.0-or-later AND Apache-2.0 AND BSL-1.0 AND MIT @@ -26,7 +25,6 @@ URL: http://ccache.dev/ Source0: https://github.com/ccache/ccache/releases/download/v%{version}/%{name}-%{version}.tar.gz Source1: %{name}.sh.in Source2: %{name}.csh.in -Patch1: ccache-unbundle.patch BuildRequires: /usr/bin/asciidoctor BuildRequires: cmake @@ -46,8 +44,8 @@ BuildRequires: clang clang-tools-extra Requires: coreutils # For groupadd Requires(pre): shadow-utils -Provides: bundled(blake3) = 1.5.0 -Provides: bundled(span-lite) = 0.10.3 +Provides: bundled(blake3) = 1.5.1 +Provides: bundled(span-lite) = 0.11.0 Provides: bundled(cxxurl) %description @@ -59,11 +57,8 @@ being done again. The main focus is to handle the GNU C/C++ compiler %prep %setup -q -%patch -P1 -p1 -b .unbundle -find -name \*.[hc]pp \ - -exec sed -i -E -e 's,third_party/(fmt/|httplib.h|tl/expected.hpp|xxhash.h),\1,' \ - -e 's,third_party/doctest.h,doctest/doctest.h,' {} + -rm -r src/third_party/[ac-lo-tv-z]* src/third_party/minitrace.c +# win32-compat gets imported, but not used +rm -r src/third_party/{[ad-lo-tvy-z]*,cpp-httplib} sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \ %{SOURCE1} > %{name}.sh sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \ @@ -236,6 +231,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Sun Jun 02 2024 Orion Poplawski - 4.10-1 +- Update to 4.10 + * Sat May 11 2024 Kevin Fenzi - 4.9.1-2 - rebuild for hiredis soname bump diff --git a/sources b/sources index bcee6d1..fab1821 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ccache-4.9.1.tar.gz) = 0945d46aaa8f76098356bed0a1258d1c8b19564247acc34ca3d71e0bd12e7edf095ad43e23c7459c8174be8ca6569c671da09a864edc57b77113bc1d5602cd28 +SHA512 (ccache-4.10.tar.gz) = 3bc57436483e789fdbb12f7c1ca0e7fe2c3437cebff9450b34f4584786d18fa6cb5906aac1cb1530a7bf3bf01198dcf088696a1e6dcba5cf56ba529d9fd3af4c From 07003a9da85eff3b212eda5dd253a6453aaf2f25 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 11 Jul 2024 21:12:58 -0600 Subject: [PATCH 36/47] Update to 4.10.1 --- .gitignore | 1 + ccache.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9b59100..474c3fb 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /ccache-4.9.tar.gz /ccache-4.9.1.tar.gz /ccache-4.10.tar.gz +/ccache-4.10.1.tar.gz diff --git a/ccache.spec b/ccache.spec index 4acab09..fe7fe1c 100644 --- a/ccache.spec +++ b/ccache.spec @@ -12,7 +12,7 @@ %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache) Name: ccache -Version: 4.10 +Version: 4.10.1 Release: 1%{?dist} Summary: C/C++ compiler cache @@ -231,6 +231,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Fri Jul 12 2024 Orion Poplawski - 4.10.1-1 +- Update to 4.10.1 + * Sun Jun 02 2024 Orion Poplawski - 4.10-1 - Update to 4.10 diff --git a/sources b/sources index fab1821..f4ace0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ccache-4.10.tar.gz) = 3bc57436483e789fdbb12f7c1ca0e7fe2c3437cebff9450b34f4584786d18fa6cb5906aac1cb1530a7bf3bf01198dcf088696a1e6dcba5cf56ba529d9fd3af4c +SHA512 (ccache-4.10.1.tar.gz) = 28c91693e9a37eed494ff4fc8a98e12d566fa8510bab3587a7a67e94b80b8d9c146952ffe13c5b852adf5c2b91e70f073b70809f36fbbd8730fbbf900a7ddc55 From 474ace809b43786223fc706cb3f4a78ce39f88cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 19:02:42 +0000 Subject: [PATCH 37/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- ccache.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ccache.spec b/ccache.spec index fe7fe1c..9425e22 100644 --- a/ccache.spec +++ b/ccache.spec @@ -13,7 +13,7 @@ Name: ccache Version: 4.10.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C/C++ compiler cache # See LICENSE.adoc for licenses of bundled codes @@ -231,6 +231,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 4.10.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jul 12 2024 Orion Poplawski - 4.10.1-1 - Update to 4.10.1 From fe012d61e0c40d955a1089e9b892a0abed30fb85 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 26 Jul 2024 11:04:28 -0500 Subject: [PATCH 38/47] Rebuild for fmt 11 Signed-off-by: Kefu Chai Signed-off-by: Michel Lind --- 0001-build-try-harder-to-determine-fmt.patch | 40 +++++++++++++++++++ 0002-build-fix-detection-of-fmt-version.patch | 37 +++++++++++++++++ ccache.spec | 10 ++++- 3 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 0001-build-try-harder-to-determine-fmt.patch create mode 100644 0002-build-fix-detection-of-fmt-version.patch diff --git a/0001-build-try-harder-to-determine-fmt.patch b/0001-build-try-harder-to-determine-fmt.patch new file mode 100644 index 0000000..4d1d099 --- /dev/null +++ b/0001-build-try-harder-to-determine-fmt.patch @@ -0,0 +1,40 @@ +From 71f772e9d3d4f8045cfa7bccd03bd21c1e8fbef1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= +Date: Tue, 2 Jul 2024 15:46:44 +0200 +Subject: [PATCH] build: Try harder to determine FMT_VERSION (#1478) + +fmt-11.0 moved the FMT_VERSION from core.h to base.h, so try the +new header first and then fall back to the old one. + +Closes: #1477 +--- + cmake/FindFmt.cmake | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/cmake/FindFmt.cmake b/cmake/FindFmt.cmake +index 55126a3172..0619f4615e 100644 +--- a/cmake/FindFmt.cmake ++++ b/cmake/FindFmt.cmake +@@ -3,11 +3,19 @@ mark_as_advanced(FMT_INCLUDE_DIR FMT_LIBRARY) + if(DEP_FMT STREQUAL "BUNDLED") + message(STATUS "Using bundled Fmt as requested") + else() +- find_path(FMT_INCLUDE_DIR fmt/core.h) ++ find_path(FMT_INCLUDE_DIR fmt/base.h fmt/core.h) + find_library(FMT_LIBRARY fmt) + if(FMT_INCLUDE_DIR AND FMT_LIBRARY) +- file(READ "${FMT_INCLUDE_DIR}/fmt/core.h" _fmt_core_h) +- string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_core_h}") ++ file(READ "${FMT_INCLUDE_DIR}/fmt/base.h" _fmt_base_h) ++ string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_base_h}") ++ if("${CMAKE_MATCH_0}" STREQUAL "") ++ file(READ "${FMT_INCLUDE_DIR}/fmt/core.h" _fmt_core_h) ++ string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_core_h}") ++ endif() ++ if("${CMAKE_MATCH_0}" STREQUAL "") ++ message(FATAL_ERROR "FMT_VERSION not found") ++ return() ++ endif() + math(EXPR _fmt_major "${CMAKE_MATCH_1} / 10000") + math(EXPR _fmt_minor "${CMAKE_MATCH_1} / 100 % 100") + math(EXPR _fmt_patch "${CMAKE_MATCH_1} % 100") diff --git a/0002-build-fix-detection-of-fmt-version.patch b/0002-build-fix-detection-of-fmt-version.patch new file mode 100644 index 0000000..e67af78 --- /dev/null +++ b/0002-build-fix-detection-of-fmt-version.patch @@ -0,0 +1,37 @@ +From 3b09afc5f792f0bd0a15cf6b8408ea40eb069787 Mon Sep 17 00:00:00 2001 +From: Joel Rosdahl +Date: Tue, 2 Jul 2024 17:05:43 +0200 +Subject: [PATCH] build: Fix detection of Fmt version for Fmt<11 + +Fixes regression in 71f772e9d3d4f8045cfa7bccd03bd21c1e8fbef1. +--- + cmake/FindFmt.cmake | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/cmake/FindFmt.cmake b/cmake/FindFmt.cmake +index 0619f4615e..7c39291eca 100644 +--- a/cmake/FindFmt.cmake ++++ b/cmake/FindFmt.cmake +@@ -3,15 +3,16 @@ mark_as_advanced(FMT_INCLUDE_DIR FMT_LIBRARY) + if(DEP_FMT STREQUAL "BUNDLED") + message(STATUS "Using bundled Fmt as requested") + else() +- find_path(FMT_INCLUDE_DIR fmt/base.h fmt/core.h) ++ find_path(FMT_INCLUDE_DIR NAMES fmt/base.h fmt/core.h) + find_library(FMT_LIBRARY fmt) + if(FMT_INCLUDE_DIR AND FMT_LIBRARY) +- file(READ "${FMT_INCLUDE_DIR}/fmt/base.h" _fmt_base_h) +- string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_base_h}") +- if("${CMAKE_MATCH_0}" STREQUAL "") +- file(READ "${FMT_INCLUDE_DIR}/fmt/core.h" _fmt_core_h) +- string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_core_h}") ++ if(EXISTS "${FMT_INCLUDE_DIR}/fmt/base.h") ++ set(_fmt_h base.h) ++ else() ++ set(_fmt_h core.h) + endif() ++ file(READ "${FMT_INCLUDE_DIR}/fmt/${_fmt_h}" _fmt_h_content) ++ string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_h_content}") + if("${CMAKE_MATCH_0}" STREQUAL "") + message(FATAL_ERROR "FMT_VERSION not found") + return() diff --git a/ccache.spec b/ccache.spec index 9425e22..265e0e3 100644 --- a/ccache.spec +++ b/ccache.spec @@ -13,7 +13,7 @@ Name: ccache Version: 4.10.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C/C++ compiler cache # See LICENSE.adoc for licenses of bundled codes @@ -25,6 +25,10 @@ URL: http://ccache.dev/ Source0: https://github.com/ccache/ccache/releases/download/v%{version}/%{name}-%{version}.tar.gz Source1: %{name}.sh.in Source2: %{name}.csh.in +# https://github.com/ccache/ccache/commit/83190fff9ab7298b1c5332f7d1332440763998f7 +Patch0: 0001-build-try-harder-to-determine-fmt.patch +# https://github.com/ccache/ccache/commit/3b09afc5f792f0bd0a15cf6b8408ea40eb069787 +Patch1: 0002-build-fix-detection-of-fmt-version.patch BuildRequires: /usr/bin/asciidoctor BuildRequires: cmake @@ -57,6 +61,7 @@ being done again. The main focus is to handle the GNU C/C++ compiler %prep %setup -q +%autopatch -p1 # win32-compat gets imported, but not used rm -r src/third_party/{[ad-lo-tvy-z]*,cpp-httplib} sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \ @@ -231,6 +236,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Fri Jul 26 2024 Kefu Chai - 4.10.1-3 +- Rebuilt for fmt 11 + * Wed Jul 17 2024 Fedora Release Engineering - 4.10.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From be8ac5da39c34fefc7e58bada3b9f62ba18baf96 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 30 Jul 2024 21:25:16 -0600 Subject: [PATCH 39/47] Update to 4.10.2 --- .gitignore | 1 + 0001-build-try-harder-to-determine-fmt.patch | 40 ------------------- 0002-build-fix-detection-of-fmt-version.patch | 37 ----------------- ccache.spec | 11 +++-- sources | 2 +- 5 files changed, 7 insertions(+), 84 deletions(-) delete mode 100644 0001-build-try-harder-to-determine-fmt.patch delete mode 100644 0002-build-fix-detection-of-fmt-version.patch diff --git a/.gitignore b/.gitignore index 474c3fb..71f8609 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /ccache-4.9.1.tar.gz /ccache-4.10.tar.gz /ccache-4.10.1.tar.gz +/ccache-4.10.2.tar.gz diff --git a/0001-build-try-harder-to-determine-fmt.patch b/0001-build-try-harder-to-determine-fmt.patch deleted file mode 100644 index 4d1d099..0000000 --- a/0001-build-try-harder-to-determine-fmt.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 71f772e9d3d4f8045cfa7bccd03bd21c1e8fbef1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= -Date: Tue, 2 Jul 2024 15:46:44 +0200 -Subject: [PATCH] build: Try harder to determine FMT_VERSION (#1478) - -fmt-11.0 moved the FMT_VERSION from core.h to base.h, so try the -new header first and then fall back to the old one. - -Closes: #1477 ---- - cmake/FindFmt.cmake | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) - -diff --git a/cmake/FindFmt.cmake b/cmake/FindFmt.cmake -index 55126a3172..0619f4615e 100644 ---- a/cmake/FindFmt.cmake -+++ b/cmake/FindFmt.cmake -@@ -3,11 +3,19 @@ mark_as_advanced(FMT_INCLUDE_DIR FMT_LIBRARY) - if(DEP_FMT STREQUAL "BUNDLED") - message(STATUS "Using bundled Fmt as requested") - else() -- find_path(FMT_INCLUDE_DIR fmt/core.h) -+ find_path(FMT_INCLUDE_DIR fmt/base.h fmt/core.h) - find_library(FMT_LIBRARY fmt) - if(FMT_INCLUDE_DIR AND FMT_LIBRARY) -- file(READ "${FMT_INCLUDE_DIR}/fmt/core.h" _fmt_core_h) -- string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_core_h}") -+ file(READ "${FMT_INCLUDE_DIR}/fmt/base.h" _fmt_base_h) -+ string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_base_h}") -+ if("${CMAKE_MATCH_0}" STREQUAL "") -+ file(READ "${FMT_INCLUDE_DIR}/fmt/core.h" _fmt_core_h) -+ string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_core_h}") -+ endif() -+ if("${CMAKE_MATCH_0}" STREQUAL "") -+ message(FATAL_ERROR "FMT_VERSION not found") -+ return() -+ endif() - math(EXPR _fmt_major "${CMAKE_MATCH_1} / 10000") - math(EXPR _fmt_minor "${CMAKE_MATCH_1} / 100 % 100") - math(EXPR _fmt_patch "${CMAKE_MATCH_1} % 100") diff --git a/0002-build-fix-detection-of-fmt-version.patch b/0002-build-fix-detection-of-fmt-version.patch deleted file mode 100644 index e67af78..0000000 --- a/0002-build-fix-detection-of-fmt-version.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3b09afc5f792f0bd0a15cf6b8408ea40eb069787 Mon Sep 17 00:00:00 2001 -From: Joel Rosdahl -Date: Tue, 2 Jul 2024 17:05:43 +0200 -Subject: [PATCH] build: Fix detection of Fmt version for Fmt<11 - -Fixes regression in 71f772e9d3d4f8045cfa7bccd03bd21c1e8fbef1. ---- - cmake/FindFmt.cmake | 13 +++++++------ - 1 file changed, 7 insertions(+), 6 deletions(-) - -diff --git a/cmake/FindFmt.cmake b/cmake/FindFmt.cmake -index 0619f4615e..7c39291eca 100644 ---- a/cmake/FindFmt.cmake -+++ b/cmake/FindFmt.cmake -@@ -3,15 +3,16 @@ mark_as_advanced(FMT_INCLUDE_DIR FMT_LIBRARY) - if(DEP_FMT STREQUAL "BUNDLED") - message(STATUS "Using bundled Fmt as requested") - else() -- find_path(FMT_INCLUDE_DIR fmt/base.h fmt/core.h) -+ find_path(FMT_INCLUDE_DIR NAMES fmt/base.h fmt/core.h) - find_library(FMT_LIBRARY fmt) - if(FMT_INCLUDE_DIR AND FMT_LIBRARY) -- file(READ "${FMT_INCLUDE_DIR}/fmt/base.h" _fmt_base_h) -- string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_base_h}") -- if("${CMAKE_MATCH_0}" STREQUAL "") -- file(READ "${FMT_INCLUDE_DIR}/fmt/core.h" _fmt_core_h) -- string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_core_h}") -+ if(EXISTS "${FMT_INCLUDE_DIR}/fmt/base.h") -+ set(_fmt_h base.h) -+ else() -+ set(_fmt_h core.h) - endif() -+ file(READ "${FMT_INCLUDE_DIR}/fmt/${_fmt_h}" _fmt_h_content) -+ string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_h_content}") - if("${CMAKE_MATCH_0}" STREQUAL "") - message(FATAL_ERROR "FMT_VERSION not found") - return() diff --git a/ccache.spec b/ccache.spec index 265e0e3..0d161de 100644 --- a/ccache.spec +++ b/ccache.spec @@ -12,8 +12,8 @@ %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache) Name: ccache -Version: 4.10.1 -Release: 3%{?dist} +Version: 4.10.2 +Release: 1%{?dist} Summary: C/C++ compiler cache # See LICENSE.adoc for licenses of bundled codes @@ -25,10 +25,6 @@ URL: http://ccache.dev/ Source0: https://github.com/ccache/ccache/releases/download/v%{version}/%{name}-%{version}.tar.gz Source1: %{name}.sh.in Source2: %{name}.csh.in -# https://github.com/ccache/ccache/commit/83190fff9ab7298b1c5332f7d1332440763998f7 -Patch0: 0001-build-try-harder-to-determine-fmt.patch -# https://github.com/ccache/ccache/commit/3b09afc5f792f0bd0a15cf6b8408ea40eb069787 -Patch1: 0002-build-fix-detection-of-fmt-version.patch BuildRequires: /usr/bin/asciidoctor BuildRequires: cmake @@ -236,6 +232,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Wed Jul 31 2024 Orion Poplawski - 4.10.2-1 +- Update to 4.10.2 + * Fri Jul 26 2024 Kefu Chai - 4.10.1-3 - Rebuilt for fmt 11 diff --git a/sources b/sources index f4ace0a..dea28e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ccache-4.10.1.tar.gz) = 28c91693e9a37eed494ff4fc8a98e12d566fa8510bab3587a7a67e94b80b8d9c146952ffe13c5b852adf5c2b91e70f073b70809f36fbbd8730fbbf900a7ddc55 +SHA512 (ccache-4.10.2.tar.gz) = c6b66821372492b3e52cfaaad9a3167039aa943557ab2e1119fa68e3e983dcd022b839c54ef016802c0092209cae8122fcb8aa4dbe3bc03902183376bde2c4ef From 593a6a35bd2472967db7414b706b53616a018427 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 13:24:52 +0000 Subject: [PATCH 40/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- ccache.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ccache.spec b/ccache.spec index 0d161de..32d2ac7 100644 --- a/ccache.spec +++ b/ccache.spec @@ -13,7 +13,7 @@ Name: ccache Version: 4.10.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C/C++ compiler cache # See LICENSE.adoc for licenses of bundled codes @@ -232,6 +232,9 @@ getent group ccache >/dev/null || groupadd -r ccache || : %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 4.10.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 31 2024 Orion Poplawski - 4.10.2-1 - Update to 4.10.2 From 8717617bacb36986d3732199a627895c26cc2a25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 14:36:20 +0100 Subject: [PATCH 41/47] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- ccache.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/ccache.spec b/ccache.spec index 32d2ac7..add086e 100644 --- a/ccache.spec +++ b/ccache.spec @@ -13,7 +13,7 @@ Name: ccache Version: 4.10.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C/C++ compiler cache # See LICENSE.adoc for licenses of bundled codes @@ -43,7 +43,6 @@ BuildRequires: clang clang-tools-extra # coreutils for triggerin, triggerpostun Requires: coreutils # For groupadd -Requires(pre): shadow-utils Provides: bundled(blake3) = 1.5.1 Provides: bundled(span-lite) = 0.11.0 Provides: bundled(cxxurl) @@ -65,6 +64,11 @@ sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \ sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \ %{SOURCE2} > %{name}.csh +# Create a sysusers.d config file +cat >ccache.sysusers.conf < %{name}-%{version}.compilers +install -m0644 -D ccache.sysusers.conf %{buildroot}%{_sysusersdir}/ccache.conf + %check %ctest @@ -217,8 +223,6 @@ done\ %ccache_trigger -p gcc-xtensa-linux-gnu xtensa-linux-gnu-gcc %ccache_trigger -p gcc-c++-xtensa-linux-gnu xtensa-linux-gnu-c++ xtensa-linux-gnu-g++ -%pre -getent group ccache >/dev/null || groupadd -r ccache || : %files -f %{name}-%{version}.compilers @@ -229,9 +233,13 @@ getent group ccache >/dev/null || groupadd -r ccache || : %dir %{_libdir}/ccache/ %attr(2770,root,ccache) %dir %{_var}/cache/ccache/ %{_mandir}/man1/ccache.1* +%{_sysusersdir}/ccache.conf %changelog +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 4.10.2-3 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Thu Jan 16 2025 Fedora Release Engineering - 4.10.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 286b8ceca272be009ebe0d7e23e10a5bd9b73c2b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 17 Mar 2025 20:26:11 -0600 Subject: [PATCH 42/47] Update to 4.11.1 --- .gitignore | 1 + ccache.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 71f8609..a4c12f3 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /ccache-4.10.tar.gz /ccache-4.10.1.tar.gz /ccache-4.10.2.tar.gz +/ccache-4.11.1.tar.gz diff --git a/ccache.spec b/ccache.spec index add086e..1a3ca74 100644 --- a/ccache.spec +++ b/ccache.spec @@ -12,8 +12,8 @@ %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache) Name: ccache -Version: 4.10.2 -Release: 3%{?dist} +Version: 4.11.1 +Release: 1%{?dist} Summary: C/C++ compiler cache # See LICENSE.adoc for licenses of bundled codes @@ -55,8 +55,7 @@ being done again. The main focus is to handle the GNU C/C++ compiler %prep -%setup -q -%autopatch -p1 +%autosetup -p1 # win32-compat gets imported, but not used rm -r src/third_party/{[ad-lo-tvy-z]*,cpp-httplib} sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \ @@ -237,6 +236,9 @@ done\ %changelog +* Tue Mar 18 2025 Orion Poplawski - 4.11.1-1 +- Update to 4.11.1 + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 4.10.2-3 - Add sysusers.d config file to allow rpm to create users/groups automatically diff --git a/sources b/sources index dea28e4..f68599f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ccache-4.10.2.tar.gz) = c6b66821372492b3e52cfaaad9a3167039aa943557ab2e1119fa68e3e983dcd022b839c54ef016802c0092209cae8122fcb8aa4dbe3bc03902183376bde2c4ef +SHA512 (ccache-4.11.1.tar.gz) = b73a86bbb3c381653ea7646abd0ff932e4369e71326feddf7e85a6d0c00ede529b0a191ab220dc04ebb1dc018661d2720f1e481759678ba8bda355c7317b27f7 From 7b28be2f5e198a9a13610d7823b1c9a6dce72fb0 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 24 Mar 2025 19:06:13 -0600 Subject: [PATCH 43/47] Update to 4.11.2 --- .gitignore | 1 + ccache.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a4c12f3..bc0d31d 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /ccache-4.10.1.tar.gz /ccache-4.10.2.tar.gz /ccache-4.11.1.tar.gz +/ccache-4.11.2.tar.gz diff --git a/ccache.spec b/ccache.spec index 1a3ca74..6d85be8 100644 --- a/ccache.spec +++ b/ccache.spec @@ -12,7 +12,7 @@ %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache) Name: ccache -Version: 4.11.1 +Version: 4.11.2 Release: 1%{?dist} Summary: C/C++ compiler cache @@ -236,6 +236,9 @@ done\ %changelog +* Tue Mar 25 2025 Orion Poplawski - 4.11.2-1 +- Update to 4.11.2 + * Tue Mar 18 2025 Orion Poplawski - 4.11.1-1 - Update to 4.11.1 diff --git a/sources b/sources index f68599f..247b73d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ccache-4.11.1.tar.gz) = b73a86bbb3c381653ea7646abd0ff932e4369e71326feddf7e85a6d0c00ede529b0a191ab220dc04ebb1dc018661d2720f1e481759678ba8bda355c7317b27f7 +SHA512 (ccache-4.11.2.tar.gz) = 3d68bfeb31a535c0b886fa7575938a69cff8c453a450fee8e6c4bbfb744a04128745a333456fb2cec4795aa26d8b8ad272c879d36019cbd579c4449a5ed3b9a8 From d9e3a94bc1a880932bb67a73bff82c92d4f23cd5 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 8 May 2025 22:08:42 -0600 Subject: [PATCH 44/47] Update to 4.11.3 --- .gitignore | 1 + ccache.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bc0d31d..7692173 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /ccache-4.10.2.tar.gz /ccache-4.11.1.tar.gz /ccache-4.11.2.tar.gz +/ccache-4.11.3.tar.gz diff --git a/ccache.spec b/ccache.spec index 6d85be8..e33e012 100644 --- a/ccache.spec +++ b/ccache.spec @@ -12,7 +12,7 @@ %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache) Name: ccache -Version: 4.11.2 +Version: 4.11.3 Release: 1%{?dist} Summary: C/C++ compiler cache @@ -236,6 +236,9 @@ done\ %changelog +* Fri May 09 2025 Orion Poplawski - 4.11.3-1 +- Update to 4.11.3 + * Tue Mar 25 2025 Orion Poplawski - 4.11.2-1 - Update to 4.11.2 diff --git a/sources b/sources index 247b73d..f7eb5e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ccache-4.11.2.tar.gz) = 3d68bfeb31a535c0b886fa7575938a69cff8c453a450fee8e6c4bbfb744a04128745a333456fb2cec4795aa26d8b8ad272c879d36019cbd579c4449a5ed3b9a8 +SHA512 (ccache-4.11.3.tar.gz) = e312be133c6cf519588afd6a40480dd796c61b05a66549830314ba343291bc1d8a9e370e21001abcbf6947ea1a1e562025c7ba229154da26b019a9f4b727bb4c From 6c9b8623ec2f3e739c886bc5ff00f65ad158ac28 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:08:53 +0000 Subject: [PATCH 45/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- ccache.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ccache.spec b/ccache.spec index e33e012..d65a076 100644 --- a/ccache.spec +++ b/ccache.spec @@ -13,7 +13,7 @@ Name: ccache Version: 4.11.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C/C++ compiler cache # See LICENSE.adoc for licenses of bundled codes @@ -236,6 +236,9 @@ done\ %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 4.11.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri May 09 2025 Orion Poplawski - 4.11.3-1 - Update to 4.11.3 From e738207be32058c0cc1474d890f1dd145738998a Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 1 Oct 2025 20:48:41 -0600 Subject: [PATCH 46/47] Update to 4.12.1 --- .gitignore | 1 + ccache.spec | 11 ++++++++--- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7692173..4422e68 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /ccache-4.11.1.tar.gz /ccache-4.11.2.tar.gz /ccache-4.11.3.tar.gz +/ccache-4.12.1.tar.gz diff --git a/ccache.spec b/ccache.spec index d65a076..b966bf3 100644 --- a/ccache.spec +++ b/ccache.spec @@ -12,8 +12,8 @@ %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache) Name: ccache -Version: 4.11.3 -Release: 2%{?dist} +Version: 4.12.1 +Release: 1%{?dist} Summary: C/C++ compiler cache # See LICENSE.adoc for licenses of bundled codes @@ -113,6 +113,8 @@ find $RPM_BUILD_ROOT%{_libdir}/ccache -type l | \ install -m0644 -D ccache.sysusers.conf %{buildroot}%{_sysusersdir}/ccache.conf +install -m0644 README.md %{buildroot}%{_pkgdocdir}/ + %check %ctest @@ -226,7 +228,7 @@ done\ %files -f %{name}-%{version}.compilers %license GPL-3.0.txt LICENSE.* -%doc doc/AUTHORS.* doc/MANUAL.* doc/NEWS.* README.md +%{_pkgdocdir}/ %config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh %{_bindir}/ccache %dir %{_libdir}/ccache/ @@ -236,6 +238,9 @@ done\ %changelog +* Thu Oct 02 2025 Orion Poplawski - 4.12.1-1 +- Update to 4.12.1 + * Wed Jul 23 2025 Fedora Release Engineering - 4.11.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index f7eb5e6..03a471d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ccache-4.11.3.tar.gz) = e312be133c6cf519588afd6a40480dd796c61b05a66549830314ba343291bc1d8a9e370e21001abcbf6947ea1a1e562025c7ba229154da26b019a9f4b727bb4c +SHA512 (ccache-4.12.1.tar.gz) = 6536916405ecf02c2a657fd3c20869e4c03b5c5480e56c8f61ca17ca8a59a652a2738af00a0ef99bd5ba6d0195a18a177e64d4c4dcd8beb7c9a39c94d7c98517 From b8b5c9c0682d64e84366bdfec119d5ab9dc5eef1 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 26 Nov 2025 17:36:09 -0700 Subject: [PATCH 47/47] Update to 4.12.2 --- .gitignore | 1 + ccache.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4422e68..b0b7403 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /ccache-4.11.2.tar.gz /ccache-4.11.3.tar.gz /ccache-4.12.1.tar.gz +/ccache-4.12.2.tar.gz diff --git a/ccache.spec b/ccache.spec index b966bf3..f8d1589 100644 --- a/ccache.spec +++ b/ccache.spec @@ -12,7 +12,7 @@ %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache) Name: ccache -Version: 4.12.1 +Version: 4.12.2 Release: 1%{?dist} Summary: C/C++ compiler cache @@ -238,6 +238,9 @@ done\ %changelog +* Thu Nov 27 2025 Orion Poplawski - 4.12.2-1 +- Update to 4.12.2 + * Thu Oct 02 2025 Orion Poplawski - 4.12.1-1 - Update to 4.12.1 diff --git a/sources b/sources index 03a471d..a73b9cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ccache-4.12.1.tar.gz) = 6536916405ecf02c2a657fd3c20869e4c03b5c5480e56c8f61ca17ca8a59a652a2738af00a0ef99bd5ba6d0195a18a177e64d4c4dcd8beb7c9a39c94d7c98517 +SHA512 (ccache-4.12.2.tar.gz) = e078a393f41660e401c3a2795fe2c2784413fe9e15313e7a996cd321e0180d5b5b89faf723a4fe3e6414ee644de198707b6bf6d0f003bdf2cd49fad0288bdf73