commit 57439632423cbb5faaba11ef239b7dffb92a79a7 Author: Danny Rawlins <contact@romster.me> Date: Wed Oct 28 23:06:41 2020 +1100 [notify] ccache: 3.7.12 -> 4.0 New dependency cmake Changed compression algorithm from Deflate (zlib) to Zstandard, zstd will be used if installed, else it'll compile ccache staticly with a local zstd copy Changed hash algorithm from MD4 to BLAKE3 Improved cache directory structure Changed the default cache directory location to follow the XDG base directory specification The CCACHE_DIR environment variable still overrides the default location just like before The cache directory structure has changed compared to previous versions (more details below). This means that ccache 4.0 will not share cache results with earlier versions. It is however safe to run ccache 4.0 and earlier versions against the same cache directory: cache bookkeeping, statistics and cleanup are backward compatible, with the minor exception that some statistics counters incremented by ccache 4.0 won’t be visible when running ccache -s with an older version https://ccache.dev/releasenotes.html#_ccache_4_0 diff --git a/ccache/.signature b/ccache/.signature index a7a1620ff..1afe58792 100644 --- a/ccache/.signature +++ b/ccache/.signature @@ -1,5 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/TcR3kdrHghk9q3iFhn+cM7RztxvCQ2bt+NvnFRd2XEhFlvn5Rx8wkgfTDzpuDPQBImUsHx19fWBPrRc+S+vfwY= -SHA256 (Pkgfile) = dbb96b2d20d0f02ce014b0b710a6f0ca315725e88f8c5798d0c7bc9526ee97a1 +RWSE3ohX2g5d/d9v9czK2S/b0i7DUL7hYSCNFkpUKeTZT2PakbcRaoTVl/lAjhrgrxzLyv54LX18tPXoEM4RWAYBHRmSuILaIww= +SHA256 (Pkgfile) = cf7be007767c4add512d2d7adb5314a56cc9a2d132d7e58b919cbfbd47f80c4f SHA256 (.footprint) = aa85bfc686cf873efffd292c55eae8016e161bd8074d4f3490539f6089eead23 -SHA256 (ccache-3.7.12.tar.xz) = a02f4e8360dc6618bc494ca35b0ae21cea080f804a4898eab1ad3fcd108eb400 +SHA256 (ccache-4.0.tar.xz) = ac1b82fe0a5e39905945c4d68fcb24bd0f32344869faf647a1b8d31e544dcb88 +SHA256 (ccache.1) = 3103469f87eb78a058483b7a0eb93be48125872abfb7e15eaeead5e5e537c0c6 +SHA256 (ccache-man.patch) = 8d89650324706c4ea243c87d45c54bc75139112d53026c82a7f3cddd3a8da53b diff --git a/ccache/Pkgfile b/ccache/Pkgfile index 6dee74fe3..1511f52f1 100644 --- a/ccache/Pkgfile +++ b/ccache/Pkgfile @@ -1,21 +1,33 @@ # Description: A fast compiler cache. # URL: https://ccache.dev/ # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: zlib -# Optional: clang-ccache-bindings +# Depends on: cmake +# Optional: clang-ccache-bindings asciidoc zstd name=ccache -version=3.7.12 +version=4.0 release=1 -source=(https://github.com/$name/$name/releases/download/v$version/$name-$version.ta...) +source=(https://github.com/$name/$name/releases/download/v$version/$name-$version.ta... + ccache.1 + ccache-man.patch) build() { - cd $name-$version + # https://github.com/ccache/ccache/issues/684 + patch -d $name-$version -p1 -i $SRC/ccache-man.patch - ./configure --prefix=/usr + cmake -S$name-$version -Bbuild \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DZSTD_FROM_INTERNET="$(prt-get isinst zstd &> /dev/null && echo OFF || echo ON)" - make - make DESTDIR=$PKG install + cmake --build build + DESTDIR=$PKG cmake --install build + + # install bundled man page else generate it with asciidoc + if [ ! -e '/usr/bin/asciidoc' ]; then + install -d $PKG/usr/share/man/man1 + install -m 644 $SRC/ccache.1 $PKG/usr/share/man/man1/ + fi install -d $PKG/usr/lib/ccache diff --git a/ccache/ccache-man.patch b/ccache/ccache-man.patch new file mode 100644 index 000000000..c4441243f --- /dev/null +++ b/ccache/ccache-man.patch @@ -0,0 +1,28 @@ +diff -pruN ccache-4.0.orig/doc/CMakeLists.txt ccache-4.0/doc/CMakeLists.txt +--- ccache-4.0.orig/doc/CMakeLists.txt 2020-10-28 22:26:27.770955558 +1100 ++++ ccache-4.0/doc/CMakeLists.txt 2020-10-28 22:29:16.092274569 +1100 +@@ -58,7 +58,11 @@ else() + COMMAND a2x --doctype manpage --format manpage MANUAL.xml + MAIN_DEPENDENCY MANUAL.xml + ) +- add_custom_target(doc-man-page DEPENDS ccache.1) ++ add_custom_target(doc-man-page ALL DEPENDS ccache.1) ++ install( ++ FILES "${CMAKE_CURRENT_BINARY_DIR}/ccache.1" ++ DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 ++ ) + set(doc_files "${doc_files}" ccache.1) + endif() + +diff -pruN ccache-4.0.orig/doc/MANUAL.adoc ccache-4.0/doc/MANUAL.adoc +--- ccache-4.0.orig/doc/MANUAL.adoc 2020-10-28 22:26:27.770955558 +1100 ++++ ccache-4.0/doc/MANUAL.adoc 2020-10-28 22:30:10.304959158 +1100 +@@ -8,7 +8,7 @@ CCACHE(1) + Name + ---- + +-Ccache - a fast C/C++ compiler cache ++ccache - a fast C/C++ compiler cache + + + Synopsis