Github messages for voidlinux
 help / color / mirror / Atom feed
From: Piraty <Piraty@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] ccache: build manpage, enable tests
Date: Sun, 01 Nov 2020 02:09:37 +0100	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26035@inbox.vuxu.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 331 bytes --]

There is a new pull request by Piraty against master on the void-packages repository

https://github.com/Piraty/void-packages ccache-build-manpage
https://github.com/void-linux/void-packages/pull/26035

ccache: build manpage, enable tests


A patch file from https://github.com/void-linux/void-packages/pull/26035.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ccache-build-manpage-26035.patch --]
[-- Type: text/x-diff, Size: 3120 bytes --]

From 4558f0e8f967104a8897e452a773f24d427e4498 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
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                       | 24 ++++++++++++--
 2 files changed, 53 insertions(+), 3 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 <erik@ejohansson.se>
+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..b8847b310db 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 <gottox@voidlinux.org>"
 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
+	configure_args+=" -DENABLE_TESTING=OFF"
+else
+	hostmakedepends="asciidoc cmake perl"
+
+	if [ -n "$XBPS_CHECK_PKGS" ]; then
+		configure_args+=" -DENABLE_TESTING=ON"
+	else
+		configure_args+=" -DENABLE_TESTING=OFF"
+	fi
+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

             reply	other threads:[~2020-11-01  1:09 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-01  1:09 Piraty [this message]
2020-11-01  1:18 ` [PR REVIEW] " sgn
2020-11-01  1:21 ` q66
2020-11-01  1:21 ` q66
2020-11-01  1:24 ` ericonr
2020-11-01  1:25 ` Piraty
2020-11-01  1:25 ` [PR PATCH] [Updated] " Piraty
2020-11-01  1:34 ` Piraty
2020-11-01  1:42 ` Piraty
2020-11-01  8:48 ` [PR REVIEW] " fosslinux
2020-11-02 19:33 ` [PR PATCH] [Closed]: " Piraty

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26035@inbox.vuxu.org \
    --to=piraty@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).