From 7d8a93ecf93042ccee7ca3e89609ee4d95f3d3d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 23 Nov 2020 11:38:58 +0100 Subject: [PATCH] ccache: update to 4.1 --- ...uild-and-install-man-page-by-default.patch | 32 ------------------- srcpkgs/ccache/template | 13 ++------ 2 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 srcpkgs/ccache/patches/build-and-install-man-page-by-default.patch diff --git a/srcpkgs/ccache/patches/build-and-install-man-page-by-default.patch b/srcpkgs/ccache/patches/build-and-install-man-page-by-default.patch deleted file mode 100644 index 1a1456c86d9..00000000000 --- a/srcpkgs/ccache/patches/build-and-install-man-page-by-default.patch +++ /dev/null @@ -1,32 +0,0 @@ -upstream: yes - -From 294ff2face26448afa68e3ef7b68bf4898d6dc77 Mon Sep 17 00:00:00 2001 -From: Erik Flodin -Date: Fri, 30 Oct 2020 10:23:08 +0100 -Subject: [PATCH] Build and install man page by default (#705) - -Fixes #684. ---- - doc/CMakeLists.txt | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt -index fb0f316..b5c9f24 100644 ---- doc/CMakeLists.txt -+++ doc/CMakeLists.txt -@@ -58,7 +58,11 @@ else() - COMMAND ${A2X_EXE} --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() - --- -2.29.2 - diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template index 7cf3ca186b7..d745cb36cc8 100644 --- a/srcpkgs/ccache/template +++ b/srcpkgs/ccache/template @@ -1,7 +1,7 @@ # Template file for 'ccache' pkgname=ccache -version=4.0 -revision=2 +version=4.1 +revision=1 bootstrap=yes build_style=cmake configure_args="-DENABLE_TESTING=OFF" @@ -12,7 +12,7 @@ license="GPL-3.0-or-later" homepage="https://ccache.samba.org/" changelog="https://ccache.dev/releasenotes.html" distfiles="https://github.com/ccache/ccache/releases/download/v${version}/${pkgname}-${version}.tar.xz" -checksum=ac1b82fe0a5e39905945c4d68fcb24bd0f32344869faf647a1b8d31e544dcb88 +checksum=5fdc804056632d722a1182e15386696f0ea6c59cb4ab4d65a54f0b269ae86f99 if [ -z "$CHROOT_READY" ]; then hostmakedepends="cmake-bootstrap" @@ -26,15 +26,8 @@ fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" - configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic" fi -post_build() { - if [ "$CHROOT_READY" ]; then - mv build/doc/Ccache.1 build/doc/ccache.1 - fi -} - post_install() { vmkdir usr/lib/ccache/bin # clang