diff --git a/README.en.md b/README.en.md index 65bd9287a829478de7fa36fc017f019cf81da417..98239ad005c4b551a0222c6e4ea16ce4de827964 100644 --- a/README.en.md +++ b/README.en.md @@ -3,21 +3,6 @@ #### Description ccache is a c/c++ compiler ccache -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - #### Contribution 1. Fork the repository diff --git a/README.md b/README.md index fe5ee44be16f3fe9d76bc0ce43443395897e092f..cdf45b4c7bafe92d18ae6d176447477c23a44815 100644 --- a/README.md +++ b/README.md @@ -3,22 +3,6 @@ #### 介绍 ccache is a c/c++ compiler ccache -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - #### 参与贡献 1. Fork 本仓库 diff --git a/ccache-3.7.12.tar.gz b/ccache-3.7.12.tar.gz deleted file mode 100644 index f4f129fa865a6143fdde7de5d4b57f258fcd65a0..0000000000000000000000000000000000000000 Binary files a/ccache-3.7.12.tar.gz and /dev/null differ diff --git a/ccache-4.8.3.tar.gz b/ccache-4.8.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..73bc28fab26898c5c2c14d77f23d7b41573491a3 Binary files /dev/null and b/ccache-4.8.3.tar.gz differ diff --git a/ccache.csh.in b/ccache.csh.in index 4edbb51537ec1dadd87bdffeb7bb698fa21245fd..7a8e90ac04c6e3097a4b56405fc05004a07d331e 100644 --- a/ccache.csh.in +++ b/ccache.csh.in @@ -23,4 +23,4 @@ else if ( $uid != 0 ) then setenv CCACHE_UMASK 002 unsetenv CCACHE_HARDLINK endif -endif +endif \ No newline at end of file diff --git a/ccache.spec b/ccache.spec index 0ea634596f2a3238278657b6f7571d1a63efe810..770b0b46ea26a577b919c9d01eb878f8cb2a0be2 100644 --- a/ccache.spec +++ b/ccache.spec @@ -10,7 +10,7 @@ %define abs2rel() perl -MFile::Spec -e 'print File::Spec->abs2rel(@ARGV)' %1 %2 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache) Name: ccache -Version: 3.7.12 +Version: 4.8.3 Release: 1 Summary: C/C++ compiler cache License: GPLv3+ @@ -18,9 +18,15 @@ 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 -BuildRequires: perl perl(File::Spec) zlib-devel >= 1.2.3 clang +BuildRequires: perl perl(File::Spec) +BuildRequires: rubygem-asciidoctor +BuildRequires: cmake +BuildRequires: hiredis-devel +BuildRequires: libzstd-devel +BuildRequires: clang clang-tools-extra + Requires: coreutils -Requires(pre): shadow-utils +Requires(pre): shadow-utils %description ccache is a compiler cache. It speeds up recompilation of C/C++ code by caching previous compiles and detecting when the same compile is @@ -33,15 +39,17 @@ 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 -rm -r src/zlib %build -%configure -make %{?_smp_mflags} +%cmake +%make_build +%make_build doc %install rm -rf $RPM_BUILD_ROOT %make_install +install -Dpm 644 %{_builddir}/ccache-%{version}/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 install -dm 770 $RPM_BUILD_ROOT%{_var}/cache/ccache @@ -71,8 +79,8 @@ find $RPM_BUILD_ROOT%{_libdir}/ccache -type l | \ sed -e "s|^$RPM_BUILD_ROOT|%%ghost |" > %{name}-%{version}.compilers %check -make check -make check CC=clang +ctest + %define ccache_trigger(p:) \ %triggerin -- %{-p*}\ for n in %* ; do\ @@ -188,5 +196,8 @@ getent group ccache >/dev/null || groupadd -r ccache || : %{_mandir}/man1/ccache.1* %changelog +* Fri Dec 8 zhoujing - 4.8.3-1 +- Update to 4.8.3 + * Fri Dec 4 2020 huanghaitao - 3.7.12-1 - package init