From 8ceb1f70db7136b7cd716d40f280f6449b24513e Mon Sep 17 00:00:00 2001 From: Piraty Date: Sun, 1 Nov 2020 01:33:15 +0100 Subject: [PATCH] ccache: build manpage, enable tests --- ...uild-and-install-man-page-by-default.patch | 32 +++++++++++++++++++ srcpkgs/ccache/template | 26 ++++++++++++--- 2 files changed, 54 insertions(+), 4 deletions(-) create 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 new file mode 100644 index 00000000000..1a1456c86d9 --- /dev/null +++ b/srcpkgs/ccache/patches/build-and-install-man-page-by-default.patch @@ -0,0 +1,32 @@ +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 e8d8b35e76b..37dbcdd4bfd 100644 --- a/srcpkgs/ccache/template +++ b/srcpkgs/ccache/template @@ -1,12 +1,10 @@ # Template file for 'ccache' pkgname=ccache version=4.0 -revision=1 +revision=2 bootstrap=yes build_style=cmake -hostmakedepends="cmake-bootstrap" makedepends="libzstd-devel zlib-devel" -checkdepends="perl" short_desc="Fast C/C++ Compiler Cache" maintainer="Enno Boland " license="GPL-3.0-or-later" @@ -15,11 +13,31 @@ changelog="https://ccache.dev/releasenotes.html" distfiles="https://github.com/ccache/ccache/releases/download/v${version}/${pkgname}-${version}.tar.xz" checksum=ac1b82fe0a5e39905945c4d68fcb24bd0f32344869faf647a1b8d31e544dcb88 +if [ -z "$CHROOT_READY" ]; then + hostmakedepends="cmake-bootstrap" + # tests require ctest, not available in cmake-bootstrap + unset XBPS_CHECK_PKGS +else + hostmakedepends="asciidoc perl" +fi + +if [ -n "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -DENABLE_TESTING=ON" +else + configure_args+=" -DENABLE_TESTING=OFF" +fi + if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" - configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-latomic" + 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