Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] ccache: build manpage, enable tests
@ 2020-11-01  1:09 Piraty
  2020-11-01  1:18 ` [PR REVIEW] " sgn
                   ` (9 more replies)
  0 siblings, 10 replies; 11+ messages in thread
From: Piraty @ 2020-11-01  1:09 UTC (permalink / raw)
  To: ml

[-- 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

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR REVIEW] ccache: build manpage, enable tests
  2020-11-01  1:09 [PR PATCH] ccache: build manpage, enable tests Piraty
@ 2020-11-01  1:18 ` sgn
  2020-11-01  1:21 ` q66
                   ` (8 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: sgn @ 2020-11-01  1:18 UTC (permalink / raw)
  To: ml

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/26035#discussion_r515561249

Comment:
I would try to avoid nested `if .. then ..fi`
I guess something like:
```sh
if [ -z "$CHROOT_READY" ]; then
	hostmakedepends="cmake-bootstrap"
	unset XBPS_CHECK_PKGS
else
	hostmakedepends="asciidoc cmake perl"
fi

if [ -n "$XBPS_CHECK_PKGS" ]; then
	configure_args+=" -DENABLE_TESTING=ON"
else
	configure_args+=" -DENABLE_TESTING=OFF"
fi
```

The `unset` is also used in `binutils`.

I'll try a full bootstrap later.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR REVIEW] ccache: build manpage, enable tests
  2020-11-01  1:09 [PR PATCH] ccache: build manpage, enable tests Piraty
  2020-11-01  1:18 ` [PR REVIEW] " sgn
@ 2020-11-01  1:21 ` q66
  2020-11-01  1:21 ` q66
                   ` (7 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: q66 @ 2020-11-01  1:21 UTC (permalink / raw)
  To: ml

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

New review comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/26035#discussion_r515561459

Comment:
please, just don't

messing with xbps-src variables from template is terrible, keep the nested ifs

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR REVIEW] ccache: build manpage, enable tests
  2020-11-01  1:09 [PR PATCH] ccache: build manpage, enable tests Piraty
  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
                   ` (6 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: q66 @ 2020-11-01  1:21 UTC (permalink / raw)
  To: ml

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

New review comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/26035#discussion_r515561459

Comment:
please, just don't

messing with xbps-src variables from template is terrible, keep the nested ifs

if binutils does this, then binutils should be changed, not this

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR REVIEW] ccache: build manpage, enable tests
  2020-11-01  1:09 [PR PATCH] ccache: build manpage, enable tests Piraty
                   ` (2 preceding siblings ...)
  2020-11-01  1:21 ` q66
@ 2020-11-01  1:24 ` ericonr
  2020-11-01  1:25 ` Piraty
                   ` (5 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2020-11-01  1:24 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26035#discussion_r515561702

Comment:
Shouldn't perl still be in `checkdepends`?

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR REVIEW] ccache: build manpage, enable tests
  2020-11-01  1:09 [PR PATCH] ccache: build manpage, enable tests Piraty
                   ` (3 preceding siblings ...)
  2020-11-01  1:24 ` ericonr
@ 2020-11-01  1:25 ` Piraty
  2020-11-01  1:25 ` [PR PATCH] [Updated] " Piraty
                   ` (4 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Piraty @ 2020-11-01  1:25 UTC (permalink / raw)
  To: ml

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

New review comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/26035#discussion_r515561753

Comment:
no

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] ccache: build manpage, enable tests
  2020-11-01  1:09 [PR PATCH] ccache: build manpage, enable tests Piraty
                   ` (4 preceding siblings ...)
  2020-11-01  1:25 ` Piraty
@ 2020-11-01  1:25 ` Piraty
  2020-11-01  1:34 ` Piraty
                   ` (3 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Piraty @ 2020-11-01  1:25 UTC (permalink / raw)
  To: ml

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

There is an updated 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
follow up of #26034

@pullmoll @sgn @q66 

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: 3153 bytes --]

From 8ceb1f70db7136b7cd716d40f280f6449b24513e 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                       | 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 <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..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 <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
+	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

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] ccache: build manpage, enable tests
  2020-11-01  1:09 [PR PATCH] ccache: build manpage, enable tests Piraty
                   ` (5 preceding siblings ...)
  2020-11-01  1:25 ` [PR PATCH] [Updated] " Piraty
@ 2020-11-01  1:34 ` Piraty
  2020-11-01  1:42 ` Piraty
                   ` (2 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Piraty @ 2020-11-01  1:34 UTC (permalink / raw)
  To: ml

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

There is an updated 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
follow up of #26034

@pullmoll @sgn @q66 

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: 3152 bytes --]

From 22bbe28c202b306bc83913972438615e1455f682 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                       | 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 <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..b026084cbf9 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
+	unset XBPS_CHECK_PKGS
+else
+	hostmakedepends="asciidoc perl"
+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
+
+if [ -n "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -DENABLE_TESTING=ON"
+else
+	configure_args+=" -DENABLE_TESTING=OFF"
 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

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] ccache: build manpage, enable tests
  2020-11-01  1:09 [PR PATCH] ccache: build manpage, enable tests Piraty
                   ` (6 preceding siblings ...)
  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
  9 siblings, 0 replies; 11+ messages in thread
From: Piraty @ 2020-11-01  1:42 UTC (permalink / raw)
  To: ml

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

There is an updated 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
follow up of #26034

@pullmoll @sgn @q66 

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: 3086 bytes --]

From 86bd8c099f8a7b6f3cd181c804cb19949ec23cf6 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                       | 23 ++++++++++---
 2 files changed, 51 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 <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..7cf3ca186b7 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -1,12 +1,11 @@
 # Template file for 'ccache'
 pkgname=ccache
 version=4.0
-revision=1
+revision=2
 bootstrap=yes
 build_style=cmake
-hostmakedepends="cmake-bootstrap"
+configure_args="-DENABLE_TESTING=OFF"
 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 +14,27 @@ 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"
+else
+	hostmakedepends="asciidoc perl"
+fi
+
+if [ -n "$CHROOT_READY" ] && [ -n "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -DENABLE_TESTING=ON"
+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

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR REVIEW] ccache: build manpage, enable tests
  2020-11-01  1:09 [PR PATCH] ccache: build manpage, enable tests Piraty
                   ` (7 preceding siblings ...)
  2020-11-01  1:42 ` Piraty
@ 2020-11-01  8:48 ` fosslinux
  2020-11-02 19:33 ` [PR PATCH] [Closed]: " Piraty
  9 siblings, 0 replies; 11+ messages in thread
From: fosslinux @ 2020-11-01  8:48 UTC (permalink / raw)
  To: ml

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

New review comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/26035#discussion_r515594295

Comment:
I feel like it is a recipe for breaking something changing XBPS_*

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Closed]: ccache: build manpage, enable tests
  2020-11-01  1:09 [PR PATCH] ccache: build manpage, enable tests Piraty
                   ` (8 preceding siblings ...)
  2020-11-01  8:48 ` [PR REVIEW] " fosslinux
@ 2020-11-02 19:33 ` Piraty
  9 siblings, 0 replies; 11+ messages in thread
From: Piraty @ 2020-11-02 19:33 UTC (permalink / raw)
  To: ml

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

There's a closed pull request on the void-packages repository

ccache: build manpage, enable tests
https://github.com/void-linux/void-packages/pull/26035

Description:
follow up of #26034

@pullmoll @sgn @q66 

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2020-11-02 19:33 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-01  1:09 [PR PATCH] ccache: build manpage, enable tests Piraty
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

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).