* [PR PATCH] [DRAFT] ccache: remove bootstrap=y, build manpage, enable tests
@ 2020-11-01 0:42 Piraty
2020-11-01 0:46 ` [RFC] " q66
` (11 more replies)
0 siblings, 12 replies; 13+ messages in thread
From: Piraty @ 2020-11-01 0:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 789 bytes --]
There is a new pull request by Piraty against master on the void-packages repository
https://github.com/Piraty/void-packages ccache-no-bootstrap
https://github.com/void-linux/void-packages/pull/26034
[DRAFT] ccache: remove bootstrap=y, build manpage, enable tests
#25753 bumped ccache to 4.0 and introduced cmake-bootstrap.
with ccache being `bootstrap=yes`, building manpage and tests is impossible, because building manpage requires [asciidoc](https://github.com/ccache/ccache/blob/v4.0/doc/CMakeLists.txt#L4) and [perl](https://github.com/ccache/ccache/blob/v4.0/doc/CMakeLists.txt#L52), and tests require ctest from the real cmake package which conflicts with the crippled cmake-bootsrap.
A patch file from https://github.com/void-linux/void-packages/pull/26034.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ccache-no-bootstrap-26034.patch --]
[-- Type: text/x-diff, Size: 2912 bytes --]
From 3f667ca07866809e3cf933f6cc600115ce6a5786 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 1 Nov 2020 01:33:15 +0100
Subject: [PATCH] ccache: remove bootstrap=y, build manpage, enable tests
---
...uild-and-install-man-page-by-default.patch | 32 +++++++++++++++++++
srcpkgs/ccache/template | 16 +++++++---
2 files changed, 44 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..71f86184195 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -1,12 +1,10 @@
# Template file for 'ccache'
pkgname=ccache
version=4.0
-revision=1
-bootstrap=yes
+revision=2
build_style=cmake
-hostmakedepends="cmake-bootstrap"
+hostmakedepends="asciidoc cmake perl"
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,21 @@ changelog="https://ccache.dev/releasenotes.html"
distfiles="https://github.com/ccache/ccache/releases/download/v${version}/${pkgname}-${version}.tar.xz"
checksum=ac1b82fe0a5e39905945c4d68fcb24bd0f32344869faf647a1b8d31e544dcb88
+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"
fi
+post_build() {
+ mv build/doc/Ccache.1 build/doc/ccache.1
+}
+
post_install() {
vmkdir usr/lib/ccache/bin
# clang
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [RFC] ccache: remove bootstrap=y, build manpage, enable tests
2020-11-01 0:42 [PR PATCH] [DRAFT] ccache: remove bootstrap=y, build manpage, enable tests Piraty
@ 2020-11-01 0:46 ` q66
2020-11-01 0:47 ` Piraty
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: q66 @ 2020-11-01 0:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 244 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/26034#issuecomment-720008817
Comment:
ccache needs to be a part of the build container, xbps-src expects it to be present and will not install it
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [RFC] ccache: remove bootstrap=y, build manpage, enable tests
2020-11-01 0:42 [PR PATCH] [DRAFT] ccache: remove bootstrap=y, build manpage, enable tests Piraty
2020-11-01 0:46 ` [RFC] " q66
@ 2020-11-01 0:47 ` Piraty
2020-11-01 0:48 ` Piraty
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Piraty @ 2020-11-01 0:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 183 bytes --]
New comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/26034#issuecomment-720008875
Comment:
i was not aware. that could be fixed though
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [RFC] ccache: remove bootstrap=y, build manpage, enable tests
2020-11-01 0:42 [PR PATCH] [DRAFT] ccache: remove bootstrap=y, build manpage, enable tests Piraty
2020-11-01 0:46 ` [RFC] " q66
2020-11-01 0:47 ` Piraty
@ 2020-11-01 0:48 ` Piraty
2020-11-01 0:50 ` q66
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Piraty @ 2020-11-01 0:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 191 bytes --]
New comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/26034#issuecomment-720008875
Comment:
i was not aware. that could be ~fixed~ added though
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [RFC] ccache: remove bootstrap=y, build manpage, enable tests
2020-11-01 0:42 [PR PATCH] [DRAFT] ccache: remove bootstrap=y, build manpage, enable tests Piraty
` (2 preceding siblings ...)
2020-11-01 0:48 ` Piraty
@ 2020-11-01 0:50 ` q66
2020-11-01 0:51 ` Piraty
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: q66 @ 2020-11-01 0:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 203 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/26034#issuecomment-720009129
Comment:
can't be fixed without quite invasive changes into xbps-src itself
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [RFC] ccache: remove bootstrap=y, build manpage, enable tests
2020-11-01 0:42 [PR PATCH] [DRAFT] ccache: remove bootstrap=y, build manpage, enable tests Piraty
` (3 preceding siblings ...)
2020-11-01 0:50 ` q66
@ 2020-11-01 0:51 ` Piraty
2020-11-01 0:51 ` q66
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Piraty @ 2020-11-01 0:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 229 bytes --]
New comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/26034#issuecomment-720009196
Comment:
I guess it should be named ccache-bootstrap then, and we add a usable ccache with manpage
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [RFC] ccache: remove bootstrap=y, build manpage, enable tests
2020-11-01 0:42 [PR PATCH] [DRAFT] ccache: remove bootstrap=y, build manpage, enable tests Piraty
` (4 preceding siblings ...)
2020-11-01 0:51 ` Piraty
@ 2020-11-01 0:51 ` q66
2020-11-01 0:51 ` [PR PATCH] [Closed]: " q66
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: q66 @ 2020-11-01 0:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 244 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/26034#issuecomment-720009209
Comment:
either way, not mergeable in this form, feel free to reopen if you manage to convincingly refactor xbps-src
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Closed]: [RFC] ccache: remove bootstrap=y, build manpage, enable tests
2020-11-01 0:42 [PR PATCH] [DRAFT] ccache: remove bootstrap=y, build manpage, enable tests Piraty
` (5 preceding siblings ...)
2020-11-01 0:51 ` q66
@ 2020-11-01 0:51 ` q66
2020-11-01 0:52 ` sgn
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: q66 @ 2020-11-01 0:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 716 bytes --]
There's a closed pull request on the void-packages repository
[RFC] ccache: remove bootstrap=y, build manpage, enable tests
https://github.com/void-linux/void-packages/pull/26034
Description:
#25753 bumped ccache to 4.0 and introduced cmake-bootstrap.
with ccache being `bootstrap=yes`, building manpage and tests is impossible, because building manpage requires [asciidoc](https://github.com/ccache/ccache/blob/v4.0/doc/CMakeLists.txt#L4) and [perl](https://github.com/ccache/ccache/blob/v4.0/doc/CMakeLists.txt#L52), and tests require ctest from the real cmake package which conflicts with the crippled cmake-bootsrap.
If this is considered to be merged, a few commits of #25753 should be reverted along
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [RFC] ccache: remove bootstrap=y, build manpage, enable tests
2020-11-01 0:42 [PR PATCH] [DRAFT] ccache: remove bootstrap=y, build manpage, enable tests Piraty
` (6 preceding siblings ...)
2020-11-01 0:51 ` [PR PATCH] [Closed]: " q66
@ 2020-11-01 0:52 ` sgn
2020-11-01 0:52 ` Piraty
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: sgn @ 2020-11-01 0:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 379 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/26034#issuecomment-720009266
Comment:
Yes, it can't be fixed without invasive change to `xbps-src`. If you want to have `ccache` with man-pages and test, I think it's better to convert current `ccache` to `chroot-ccache` or `cripple-ccache` and build another `ccache` for outside.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [RFC] ccache: remove bootstrap=y, build manpage, enable tests
2020-11-01 0:42 [PR PATCH] [DRAFT] ccache: remove bootstrap=y, build manpage, enable tests Piraty
` (7 preceding siblings ...)
2020-11-01 0:52 ` sgn
@ 2020-11-01 0:52 ` Piraty
2020-11-01 0:52 ` Piraty
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Piraty @ 2020-11-01 0:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 152 bytes --]
New comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/26034#issuecomment-720009297
Comment:
hence draft.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [RFC] ccache: remove bootstrap=y, build manpage, enable tests
2020-11-01 0:42 [PR PATCH] [DRAFT] ccache: remove bootstrap=y, build manpage, enable tests Piraty
` (8 preceding siblings ...)
2020-11-01 0:52 ` Piraty
@ 2020-11-01 0:52 ` Piraty
2020-11-01 0:53 ` q66
2020-11-01 0:53 ` q66
11 siblings, 0 replies; 13+ messages in thread
From: Piraty @ 2020-11-01 0:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 152 bytes --]
New comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/26034#issuecomment-720009297
Comment:
hence draft.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [RFC] ccache: remove bootstrap=y, build manpage, enable tests
2020-11-01 0:42 [PR PATCH] [DRAFT] ccache: remove bootstrap=y, build manpage, enable tests Piraty
` (9 preceding siblings ...)
2020-11-01 0:52 ` Piraty
@ 2020-11-01 0:53 ` q66
2020-11-01 0:53 ` q66
11 siblings, 0 replies; 13+ messages in thread
From: q66 @ 2020-11-01 0:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 325 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/26034#issuecomment-720009340
Comment:
also, ccache being a bootstrap package is not a problem for tests or manpages
all you have to do is only enable tests and manpages (and add the dependencies) when `$CHROOT_READY` is set
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [RFC] ccache: remove bootstrap=y, build manpage, enable tests
2020-11-01 0:42 [PR PATCH] [DRAFT] ccache: remove bootstrap=y, build manpage, enable tests Piraty
` (10 preceding siblings ...)
2020-11-01 0:53 ` q66
@ 2020-11-01 0:53 ` q66
11 siblings, 0 replies; 13+ messages in thread
From: q66 @ 2020-11-01 0:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 377 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/26034#issuecomment-720009340
Comment:
also, ccache being a bootstrap package is not a problem for tests or manpages
all you have to do is only enable tests and manpages (and add the dependencies) when `$CHROOT_READY` is set (and switch the `cmake-bootstrap` for real `cmake`)
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2020-11-01 0:53 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-01 0:42 [PR PATCH] [DRAFT] ccache: remove bootstrap=y, build manpage, enable tests Piraty
2020-11-01 0:46 ` [RFC] " q66
2020-11-01 0:47 ` Piraty
2020-11-01 0:48 ` Piraty
2020-11-01 0:50 ` q66
2020-11-01 0:51 ` Piraty
2020-11-01 0:51 ` q66
2020-11-01 0:51 ` [PR PATCH] [Closed]: " q66
2020-11-01 0:52 ` sgn
2020-11-01 0:52 ` Piraty
2020-11-01 0:52 ` Piraty
2020-11-01 0:53 ` q66
2020-11-01 0:53 ` q66
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).