diff --git a/.gitignore b/.gitignore index 524e337..789d529 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ /*.tar.xz -/ccache-3.7.1.tar.gz +/ccache-3.7.4.tar.gz /ccache-3.7.5.tar.gz /ccache-3.7.6.tar.gz /ccache-3.7.7.tar.gz diff --git a/b2651f37dc24a6829ab785bd6ac885b8bccedfce.patch b/b2651f37dc24a6829ab785bd6ac885b8bccedfce.patch new file mode 100644 index 0000000..5205d03 --- /dev/null +++ b/b2651f37dc24a6829ab785bd6ac885b8bccedfce.patch @@ -0,0 +1,35 @@ +From b2651f37dc24a6829ab785bd6ac885b8bccedfce Mon Sep 17 00:00:00 2001 +From: Joel Rosdahl +Date: Sat, 22 Feb 2020 22:18:48 +0100 +Subject: [PATCH] Add pch test suite probe for seemingly broken compiler + support + +This fixes a problem mentioned by Orion Poplawski in a comment to PR #217. + +(cherry picked from commit 0d06da7803c082b43cdccfcdfd56911ba4e7d458) +--- + test/suites/pch.bash | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/test/suites/pch.bash b/test/suites/pch.bash +index caf82c45..f779a36f 100644 +--- a/test/suites/pch.bash ++++ b/test/suites/pch.bash +@@ -1,8 +1,15 @@ + SUITE_pch_PROBE() { +- touch pch.h ++ touch pch.h empty.c ++ mkdir dir ++ + if ! $REAL_COMPILER $SYSROOT -fpch-preprocess pch.h 2>/dev/null \ + || [ ! -f pch.h.gch ]; then +- echo "compiler ($($COMPILER --version | head -1)) doesn't support precompiled headers" ++ echo "compiler ($($COMPILER --version | head -n 1)) doesn't support precompiled headers" ++ fi ++ ++ $REAL_COMPILER $SYSROOT -c pch.h -o dir/pch.h.gch 2>/dev/null ++ if ! $REAL_COMPILER $SYSROOT -c -include dir/pch.h empty.c 2>/dev/null; then ++ echo "compiler ($($COMPILER --version | head -n 1)) seems to have broken support for precompiled headers" + fi + } + diff --git a/ccache.spec b/ccache.spec index c8b775b..f3df458 100644 --- a/ccache.spec +++ b/ccache.spec @@ -21,6 +21,8 @@ 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 +# Upstream fix for EL8 compiler support +Patch0: https://github.com/ccache/ccache/commit/b2651f37dc24a6829ab785bd6ac885b8bccedfce.patch BuildRequires: perl(File::Spec) BuildRequires: zlib-devel >= 1.2.3 @@ -39,7 +41,7 @@ being done again. The main focus is to handle the GNU C/C++ compiler %prep -%setup -q +%autosetup -p1 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' \ @@ -218,356 +220,5 @@ getent group ccache >/dev/null || groupadd -r ccache || : * Tue Feb 18 2020 Orion Poplawski - 3.7.7-1 - Update to 3.7.7 -* Tue Jan 28 2020 Fedora Release Engineering - 3.7.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Nov 21 2019 LuK1337 - 3.7.6-1 -- Updated to 3.7.6 - -* Thu Oct 24 2019 Michael Cullen - 3.7.5-1 -- Updated to 3.7.5 -- Updated upstream URL - -* Wed Jul 24 2019 Fedora Release Engineering - 3.7.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon May 20 2019 Michael Cullen - 3.7.1-1 -- Updated to 3.7.1 - -* Thu Jan 31 2019 Fedora Release Engineering - 3.4.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Sep 24 2018 Michael Cullen - 3.4.3-1 -- Update to 3.4.3 (bugfix release) - -* Tue Aug 28 2018 Major Hayden - 3.4.2-4 -- Added powerpc64le/ppc64le to ccache_trigger list - -* Thu Jul 12 2018 Fedora Release Engineering - 3.4.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Apr 16 2018 Michael Cullen - 3.4.2-2 -- Fix i386 build error - -* Wed Apr 11 2018 Michael Cullen - 3.4.2-1 -- Update to new version - -* Fri Feb 16 2018 Michael Cullen - 3.4.1-1 -- Update to new version - -* Wed Feb 07 2018 Fedora Release Engineering - 3.3.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sun Jan 14 2018 Michael Cullen - 3.3.5-1 -- Update to new version - -* Wed Aug 02 2017 Fedora Release Engineering - 3.3.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 3.3.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 18 2017 Ville Skyttä - 3.3.4-1 -- Update to 3.3.4 - -* Fri Feb 10 2017 Fedora Release Engineering - 3.3.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Oct 28 2016 Ville Skyttä - 3.3.3-1 -- Update to 3.3.3 - -* Thu Sep 29 2016 Ville Skyttä - 3.3.2-1 -- Update to 3.3.2 - -* Thu Sep 8 2016 Ville Skyttä - 3.3.1-1 -- Update to 3.3.1, fixes #1373295 - -* Sun Aug 28 2016 Ville Skyttä - 3.3-1 -- Update to 3.3 -- Run tests with clang too - -* Wed Aug 10 2016 Orion Poplawski - 3.2.7-3 -- Add needed requires for groupadd - -* Tue Jul 26 2016 Ville Skyttä - 3.2.7-2 -- Turn on CCACHE_CPP2 by default, fixes #1350086 - -* Wed Jul 20 2016 Ville Skyttä - 3.2.7-1 -- Update to 3.2.7, fixes #1307367 -- Add nacl*-gcc symlink triggers - -* Thu Jul 14 2016 Ville Skyttä - 3.2.6-1 -- Update to 3.2.6 - -* Mon Apr 18 2016 Ville Skyttä - 3.2.5-1 -- Update to 3.2.5 - -* Wed Feb 03 2016 Fedora Release Engineering - 3.2.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jan 26 2016 Ville Skyttä - 3.2.4-2 -- Remove unnecessary %%defattr - -* Fri Oct 9 2015 Ville Skyttä - 3.2.4-1 -- Update to 3.2.4 - -* Mon Aug 17 2015 Ville Skyttä - 3.2.3-1 -- Update to 3.2.3, fixes #1227819 and #1247493 - -* Wed Jun 17 2015 Fedora Release Engineering - 3.2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon May 11 2015 Ville Skyttä - 3.2.2-1 -- Update to 3.2.2 -- Add bunch of missing cross-gcc and c++ symlink triggers (#1205187) -- Fix cross-gcc symlink ownerships - -* Fri Dec 12 2014 Ville Skyttä - 3.2.1-1 -- Update to 3.2.1 - -* Sun Nov 30 2014 Ville Skyttä - 3.2-1 -- Update to 3.2 - -* Mon Oct 20 2014 Ville Skyttä - 3.1.10-1 -- Update to 3.1.10 - -* Wed Sep 10 2014 Ville Skyttä - 3.1.9-7 -- Add clang and clang++ symlink triggers (#1140349, Jan Kratochvil) -- Mark license files as %%license where applicable - -* Fri Aug 15 2014 Fedora Release Engineering - 3.1.9-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 3.1.9-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Aug 03 2013 Fedora Release Engineering - 3.1.9-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sun Mar 31 2013 Ville Skyttä - 3.1.9-3 -- Apply upstream fix for gcc 4.8 test suite failure (#913915). -- Add arm-none-eabi and cross-gcc symlink triggers. -- Fix bogus dates in %%changelog. - -* Wed Feb 13 2013 Fedora Release Engineering - 3.1.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jan 9 2013 Ville Skyttä - 3.1.9-1 -- Update to 3.1.9. - -* Sat Aug 18 2012 Ville Skyttä - 3.1.8-1 -- Update to 3.1.8, fixes #783971. -- Update mingw* symlink triggers. - -* Wed Jul 18 2012 Fedora Release Engineering - 3.1.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sun Jan 8 2012 Ville Skyttä - 3.1.7-1 -- Update to 3.1.7. - -* Sun Dec 4 2011 Ville Skyttä - 3.1.6-2 -- Turn on CCACHE_HASHDIR by default (#759592, Jan Kratochvil). - -* Mon Aug 22 2011 Ville Skyttä - 3.1.6-1 -- Update to 3.1.6. - -* Mon May 30 2011 Ville Skyttä - 3.1.5-1 -- Update to 3.1.5. - -* Sat Apr 2 2011 Ville Skyttä - 3.1.4-4 -- Replace Requires(trigger*) with plain requires to appease rpmbuild >= 4.9. - -* Sat Apr 2 2011 Ville Skyttä - 3.1.4-3 -- Reset non-working cache dir related env settings on user switch (#651023). - -* Tue Feb 08 2011 Fedora Release Engineering -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Jan 14 2011 Ville Skyttä - 3.1.4-1 -- Update to 3.1.4. - -* Sun Dec 5 2010 Ville Skyttä - 3.1.3-2 -- Update compiler executable lists, make their package triggers more targeted. -- Auto-symlink mingw32-gcc(-c++) compilers. - -* Sun Nov 28 2010 Ville Skyttä - 3.1.3-1 -- Update to 3.1.3, fixes #657857. - -* Tue Nov 23 2010 Ville Skyttä - 3.1.2-1 -- Update to 3.1.2. - -* Thu Nov 18 2010 Ville Skyttä - 3.1.1-1 -- Update to 3.1.1. - -* Sat Sep 18 2010 Ville Skyttä - 3.1-1 -- Update to 3.1, fixes #610853. -- Make sh profile script "nounset" clean. - -* Fri Jul 16 2010 Ville Skyttä - 3.0.1-1 -- Update to 3.0.1. - -* Sat Jul 3 2010 Ville Skyttä - 3.0-1 -- Update to 3.0, no-strip patch no longer needed. - -* Fri Jun 4 2010 Ville Skyttä - 3.0-0.2.pre1 -- Reintroduce minor profile.d script performance improvements. - -* Thu May 13 2010 Ville Skyttä - 3.0-0.1.pre1 -- Update to 3.0pre1 (#591040), license changed to GPLv3+. - -* Mon Mar 1 2010 Ville Skyttä - 3.0-0.1.pre0 -- Update to 3.0pre0, all old patches applied/superseded upstream. - Note: old caches will no longer be used, see NEWS for details. -- Don't use "pathmunge" in the profile.d sh script to work around #548960. -- Patch to avoid stripping the binary during build. -- Add auto-symlink support for gcc44(-c++) and msp430-gcc. -- Run test suite during build. -- Update description. - -* Sat Dec 19 2009 Ville Skyttä - 2.4-17 -- Minor profile.d script performance improvements. -- Fix hardcoded /var/cache/ccache in profile.d scripts. - -* Mon Aug 10 2009 Ville Skyttä - 2.4-16 -- Switch #438201 patch URL to Debian patch tracking (original is MIA). - -* Fri Jul 24 2009 Fedora Release Engineering - 2.4-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Mon Feb 23 2009 Fedora Release Engineering - 2.4-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Mar 19 2008 Ville Skyttä - 2.4-13 -- Apply patch to fix path to saved dependency files (#438201). - -* Sat Feb 9 2008 Ville Skyttä - 2.4-12 -- Rebuild. - -* Tue Oct 2 2007 Ville Skyttä - 2.4-11 -- Apply upstream fix for problems when $HOME is not set (#315441). - -* Wed Aug 22 2007 Ville Skyttä -- Fix URL to upstream tarball. - -* Sun Aug 19 2007 Ville Skyttä - 2.4-10 -- License: GPLv2+ -- Make compiler symlinks relative. -- Make profile.d scripts noreplace. - -* Mon Jul 30 2007 Ville Skyttä - 2.4-9 -- Use shared cache dir for users in the ccache group by default - (#247760, based on Andy Shevchenko's work). -- Fix outdated hardlink info in cache sharing docs. -- Add auto-symlink support for avr-gcc(-c++) and arm-gp2x-linux-gcc(-c++). -- Make triggers always exit with a zero exit status. - -* Thu Mar 15 2007 Ville Skyttä - 2.4-8 -- Bypass cache with --coverage, -fprofile-arcs and -ftest-coverage - (upstream CVS and Matt Fago, #231462). - -* Fri Nov 10 2006 Ville Skyttä - 2.4-7 -- Require coreutils for triggers (#215030). - -* Wed Aug 9 2006 Ville Skyttä - 2.4-6 -- Add auto-symlink support for compat-gcc-34(-c++). -- Untabify, escape macros in changelog. - -* Tue May 16 2006 Ville Skyttä - 2.4-5 -- Add auto-symlink support for g++-libstdc++-so_7. - -* Sat Nov 26 2005 Ville Skyttä - 2.4-4 -- Drop "bin" from compiler symlink path. -- Make profile.d snippets non-executable (#35714). - -* Sun May 1 2005 Ville Skyttä - 2.4-3 -- Auto-symlink update: add compat-gcc-32 and compat-gcc-32-c++, drop - bunch of no longer relevant compilers. - -* Wed Apr 6 2005 Michael Schwendt - 2.4-2 -- rebuilt - -* Sun Sep 26 2004 Ville Skyttä - 0:2.4-0.fdr.1 -- Update to 2.4. -- Add symlinking support for gcc4 and gcc4-c++. -- Move the ccache executable to %%{_bindir}. -- Include more docs. - -* Fri Jun 25 2004 Ville Skyttä - 0:2.3-0.fdr.5 -- Add support for gcc33 and g++33. - -* Thu Jun 10 2004 Ville Skyttä - 0:2.3-0.fdr.4 -- Fix hardcoded lib path in profile.d scriptlets (bug 1558). - -* Mon May 3 2004 Ville Skyttä - 0:2.3-0.fdr.3 -- Add support for gcc34 and g++34, and - %%{_target_cpu}-%%{_vendor}-%%{_target_os}-* variants. - -* Thu Nov 13 2003 Ville Skyttä - 0:2.3-0.fdr.2 -- Add overriding symlinks for gcc-ssa and g++-ssa (bug 963). - -* Tue Nov 11 2003 Ville Skyttä - 0:2.3-0.fdr.1 -- Update to 2.3. -- Implement triggers to keep list of "aliased" compilers up to date on the fly. -- Add gcc32 and a bunch of legacy packages to the list of overridden compilers. - -* Sat Aug 2 2003 Ville Skyttä - 0:2.2-0.fdr.6 -- Add c++ to the list of overridden compilers (bug 548). -- Own everything including dirs under %%{_libdir}/ccache (bug 529). -- %%{buildroot} -> $RPM_BUILD_ROOT. -- Fix man page permissions. -- Use %%{?_smp_mflags}. -- Other cosmetic specfile tweaks. - -* Sat Mar 29 2003 Warren Togami 2.2-0.fdr.5 -- Epoch: 0 -- Remove /usr/lib/ccache/sbin from PATH - -* Fri Mar 28 2003 Warren Togami 2.2-0.fdr.4 -- Add BuildRequires: autoconf >= 0:2.52 -- Add Requires: gcc, gcc-c++ (minimal expectation of compilers) - -* Fri Mar 28 2003 Warren Togami 2.2-0.fdr.3 -- No longer use %%ghost, symlinks always exist - -* Thu Mar 27 2003 Warren Togami 2.2-0.fdr.2 -- Move symlinks to /usr/lib/ccache/bin -- Use /etc/profile.d/ccache.* scripts to add it to PATH - As long as it is before /usr/bin it is good. - -* Thu Mar 27 2003 Warren Togami 2.2-0.fdr.1 -- Move symlinks to /bin since it seems to be at the beginning of PATH of all users - before /usr/bin, the location of the real compiler. -- Package symlinks rather than create and remove during %%post and %%postun - -* Thu Feb 20 2003 Warren Togami 2.2-4.fedora.1 -- Fedora - -* Thu Feb 20 2003 Samir M. Nassar 2.2-3.redconcepts -- Added symlinks to g++ -- Removed symlink removal in post - -* Thu Feb 20 2003 Samir M. Nassar 2.2-2.redconcepts -- Cleans symlinks if present to make upgrades easier - -* Thu Feb 20 2003 Samir M. Nassar 2.2-1.redconcepts -- Upgraded to ccache 2.2 - -* Tue Feb 04 2003 Samir M. Nassar 2.1.1-4.redconcepts -- Using %%post to create the soft symlinks -- Using %%postun to remove the soft symlinks -- Thanks to Che for the help -- Packaged as user - -* Sun Jan 19 2003 Samir M. Nassar 2.1.1-3.redconcepts -- make a soft symlink between ccache and gcc -- make a soft symlink between ccache and cc - -* Thu Jan 16 2003 Samir M. Nassar 2.1.1-2.redconcepts -- Normalized spec file. - -* Wed Jan 15 2003 Samir M, Nassar 2.1.1-1.redconcepts -- Using ccache 2.2.1 sources -- Changed release to redconcepts for consistency - -* Tue Oct 22 2002 Samir M. Nassar 1.9-1.rcn -- Initial RedConcepts.NET (rcn) build for Red Hat Linux 8.0 +* Wed Sep 18 2019 Devrim Gündüz - 3.7.4-1 +- Initial packaging for EPEL 8