* [PR PATCH] ccache: update to 4.0
@ 2020-10-18 20:38 pullmoll
2020-10-19 1:59 ` sgn
` (20 more replies)
0 siblings, 21 replies; 22+ messages in thread
From: pullmoll @ 2020-10-18 20:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 646 bytes --]
There is a new pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages ccache
https://github.com/void-linux/void-packages/pull/25724
ccache: update to 4.0
This release changes from using autoconf to cmake which is why
we need to remove the bootstrap=yes (N.B.: cmake is not bootstrap=yes).
I think we cannot turn `cmake` into a `bootstrap=yes` package.
Should we create a (legacy) chroot-ccache with a < 4.0 version?
There seems to be no way to build `ccache` >= 4.0 with just autoconf.
A patch file from https://github.com/void-linux/void-packages/pull/25724.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ccache-25724.patch --]
[-- Type: text/x-diff, Size: 2744 bytes --]
From 9fa76323d8d86b5c0746ae2e50f80ff9aad8d323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 18 Oct 2020 22:01:57 +0200
Subject: [PATCH 1/2] ccache: update to 4.0
This release changes from using autoconf to cmake which is why
we need to remove the bootstrap=yes (N.B.: cmake is not bootstrap=yes).
---
srcpkgs/ccache/template | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 481c4466199..f290805e3ec 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -1,11 +1,9 @@
# Template file for 'ccache'
pkgname=ccache
-version=3.7.12
+version=4.0
revision=1
-bootstrap=yes
-build_style=gnu-configure
-make_check_args="CC=gcc"
-makedepends="zlib-devel"
+build_style=cmake
+makedepends="libzstd-devel zlib-devel"
checkdepends="perl"
short_desc="Fast C/C++ Compiler Cache"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -13,7 +11,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=a02f4e8360dc6618bc494ca35b0ae21cea080f804a4898eab1ad3fcd108eb400
+checksum=ac1b82fe0a5e39905945c4d68fcb24bd0f32344869faf647a1b8d31e544dcb88
post_install() {
vmkdir usr/lib/ccache/bin
From db1489221e3ad36a7e15f6e25980ffd996bb9d97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 18 Oct 2020 22:03:25 +0200
Subject: [PATCH 2/2] base-chroot: remove ccache dependency
Because ccache >= 4.0 now is built using cmake, ccache can no longer
be a bootstrap=yes package. We would need to (re-)introduce a
chroot-ccache < 4.0 package or make cmake also a bootstrap=yes package.
I am undecided what to do. For now remove ccache from the base-chroot files.
---
srcpkgs/base-chroot/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/base-chroot/template b/srcpkgs/base-chroot/template
index 78f6d0cc2a1..aad7e4aed5b 100644
--- a/srcpkgs/base-chroot/template
+++ b/srcpkgs/base-chroot/template
@@ -1,7 +1,7 @@
# Template file for 'base-chroot'
pkgname=base-chroot
version=0.66
-revision=3
+revision=4
bootstrap=yes
build_style=meta
short_desc="Minimal set of packages required for chroot with xbps-src"
@@ -17,6 +17,6 @@ esac
depends+="
base-files binutils gcc gcc-ada libada-devel
patch sed findutils diffutils make gzip coreutils
- file bsdtar ccache xbps mpfr ncurses libreadline8
+ file bsdtar xbps mpfr ncurses libreadline8
chroot-bash chroot-grep chroot-gawk chroot-distcc
chroot-util-linux chroot-git"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: ccache: update to 4.0
2020-10-18 20:38 [PR PATCH] ccache: update to 4.0 pullmoll
@ 2020-10-19 1:59 ` sgn
2020-10-19 4:21 ` pullmoll
` (19 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: sgn @ 2020-10-19 1:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 218 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/25724#issuecomment-711467795
Comment:
Alternately, we can package a chroot-cmake with vendored libraries for bootstrap.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: ccache: update to 4.0
2020-10-18 20:38 [PR PATCH] ccache: update to 4.0 pullmoll
2020-10-19 1:59 ` sgn
@ 2020-10-19 4:21 ` pullmoll
2020-10-19 4:52 ` [PR PATCH] [Updated] " pullmoll
` (18 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: pullmoll @ 2020-10-19 4:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 394 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/25724#issuecomment-711523642
Comment:
@sgn That would be better because the cache data format also changed.
Using the same cache directory for a `chroot-ccache-3.x` and `ccache` >= 4.0 would work but not re-use the cache data.
If you can come up with a `chroot-cmake` that would be great.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] ccache: update to 4.0
2020-10-18 20:38 [PR PATCH] ccache: update to 4.0 pullmoll
2020-10-19 1:59 ` sgn
2020-10-19 4:21 ` pullmoll
@ 2020-10-19 4:52 ` pullmoll
2020-10-19 4:56 ` pullmoll
` (17 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: pullmoll @ 2020-10-19 4:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 651 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages ccache
https://github.com/void-linux/void-packages/pull/25724
ccache: update to 4.0
This release changes from using autoconf to cmake which is why
we need to remove the bootstrap=yes (N.B.: cmake is not bootstrap=yes).
I think we cannot turn `cmake` into a `bootstrap=yes` package.
Should we create a (legacy) chroot-ccache with a < 4.0 version?
There seems to be no way to build `ccache` >= 4.0 with just autoconf.
A patch file from https://github.com/void-linux/void-packages/pull/25724.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ccache-25724.patch --]
[-- Type: text/x-diff, Size: 3523 bytes --]
From 9fa76323d8d86b5c0746ae2e50f80ff9aad8d323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 18 Oct 2020 22:01:57 +0200
Subject: [PATCH 1/2] ccache: update to 4.0
This release changes from using autoconf to cmake which is why
we need to remove the bootstrap=yes (N.B.: cmake is not bootstrap=yes).
---
srcpkgs/ccache/template | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 481c4466199..f290805e3ec 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -1,11 +1,9 @@
# Template file for 'ccache'
pkgname=ccache
-version=3.7.12
+version=4.0
revision=1
-bootstrap=yes
-build_style=gnu-configure
-make_check_args="CC=gcc"
-makedepends="zlib-devel"
+build_style=cmake
+makedepends="libzstd-devel zlib-devel"
checkdepends="perl"
short_desc="Fast C/C++ Compiler Cache"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -13,7 +11,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=a02f4e8360dc6618bc494ca35b0ae21cea080f804a4898eab1ad3fcd108eb400
+checksum=ac1b82fe0a5e39905945c4d68fcb24bd0f32344869faf647a1b8d31e544dcb88
post_install() {
vmkdir usr/lib/ccache/bin
From 97083c1f5eb169c33032405d1f7f524609283f63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 18 Oct 2020 22:03:25 +0200
Subject: [PATCH 2/2] base-chroot: remove ccache dependency
Because ccache >= 4.0 now is built using cmake, ccache can no longer
be a bootstrap=yes package. We would need to (re-)introduce a
chroot-ccache < 4.0 package or make cmake also a bootstrap=yes package.
I am undecided what to do. For now remove ccache from the base-chroot files.
---
srcpkgs/base-chroot/template | 4 ++--
srcpkgs/ccache/template | 11 +++++++++++
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/base-chroot/template b/srcpkgs/base-chroot/template
index 78f6d0cc2a1..aad7e4aed5b 100644
--- a/srcpkgs/base-chroot/template
+++ b/srcpkgs/base-chroot/template
@@ -1,7 +1,7 @@
# Template file for 'base-chroot'
pkgname=base-chroot
version=0.66
-revision=3
+revision=4
bootstrap=yes
build_style=meta
short_desc="Minimal set of packages required for chroot with xbps-src"
@@ -17,6 +17,6 @@ esac
depends+="
base-files binutils gcc gcc-ada libada-devel
patch sed findutils diffutils make gzip coreutils
- file bsdtar ccache xbps mpfr ncurses libreadline8
+ file bsdtar xbps mpfr ncurses libreadline8
chroot-bash chroot-grep chroot-gawk chroot-distcc
chroot-util-linux chroot-git"
diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index f290805e3ec..41f48ab4be4 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -13,6 +13,17 @@ changelog="https://ccache.dev/releasenotes.html"
distfiles="https://github.com/ccache/ccache/releases/download/v${version}/${pkgname}-${version}.tar.xz"
checksum=ac1b82fe0a5e39905945c4d68fcb24bd0f32344869faf647a1b8d31e544dcb88
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
+
+pre_configure() {
+ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ vsed -i src/CMakeLists.txt \
+ -e "/add_library/a target_link_libraries(ccache_lib PRIVATE atomic)"
+ fi
+}
+
post_install() {
vmkdir usr/lib/ccache/bin
# clang
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] ccache: update to 4.0
2020-10-18 20:38 [PR PATCH] ccache: update to 4.0 pullmoll
` (2 preceding siblings ...)
2020-10-19 4:52 ` [PR PATCH] [Updated] " pullmoll
@ 2020-10-19 4:56 ` pullmoll
2020-10-20 11:19 ` pullmoll
` (16 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: pullmoll @ 2020-10-19 4:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 651 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages ccache
https://github.com/void-linux/void-packages/pull/25724
ccache: update to 4.0
This release changes from using autoconf to cmake which is why
we need to remove the bootstrap=yes (N.B.: cmake is not bootstrap=yes).
I think we cannot turn `cmake` into a `bootstrap=yes` package.
Should we create a (legacy) chroot-ccache with a < 4.0 version?
There seems to be no way to build `ccache` >= 4.0 with just autoconf.
A patch file from https://github.com/void-linux/void-packages/pull/25724.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ccache-25724.patch --]
[-- Type: text/x-diff, Size: 3516 bytes --]
From 9fa76323d8d86b5c0746ae2e50f80ff9aad8d323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 18 Oct 2020 22:01:57 +0200
Subject: [PATCH 1/2] ccache: update to 4.0
This release changes from using autoconf to cmake which is why
we need to remove the bootstrap=yes (N.B.: cmake is not bootstrap=yes).
---
srcpkgs/ccache/template | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 481c4466199..f290805e3ec 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -1,11 +1,9 @@
# Template file for 'ccache'
pkgname=ccache
-version=3.7.12
+version=4.0
revision=1
-bootstrap=yes
-build_style=gnu-configure
-make_check_args="CC=gcc"
-makedepends="zlib-devel"
+build_style=cmake
+makedepends="libzstd-devel zlib-devel"
checkdepends="perl"
short_desc="Fast C/C++ Compiler Cache"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -13,7 +11,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=a02f4e8360dc6618bc494ca35b0ae21cea080f804a4898eab1ad3fcd108eb400
+checksum=ac1b82fe0a5e39905945c4d68fcb24bd0f32344869faf647a1b8d31e544dcb88
post_install() {
vmkdir usr/lib/ccache/bin
From b352b32aa198c73626c761f323afac93badf6960 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 18 Oct 2020 22:03:25 +0200
Subject: [PATCH 2/2] base-chroot: remove ccache dependency
Because ccache >= 4.0 now is built using cmake, ccache can no longer
be a bootstrap=yes package. We would need to (re-)introduce a
chroot-ccache < 4.0 package or make cmake also a bootstrap=yes package.
I am undecided what to do. For now remove ccache from the base-chroot files.
---
srcpkgs/base-chroot/template | 4 ++--
srcpkgs/ccache/template | 11 +++++++++++
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/base-chroot/template b/srcpkgs/base-chroot/template
index 78f6d0cc2a1..aad7e4aed5b 100644
--- a/srcpkgs/base-chroot/template
+++ b/srcpkgs/base-chroot/template
@@ -1,7 +1,7 @@
# Template file for 'base-chroot'
pkgname=base-chroot
version=0.66
-revision=3
+revision=4
bootstrap=yes
build_style=meta
short_desc="Minimal set of packages required for chroot with xbps-src"
@@ -17,6 +17,6 @@ esac
depends+="
base-files binutils gcc gcc-ada libada-devel
patch sed findutils diffutils make gzip coreutils
- file bsdtar ccache xbps mpfr ncurses libreadline8
+ file bsdtar xbps mpfr ncurses libreadline8
chroot-bash chroot-grep chroot-gawk chroot-distcc
chroot-util-linux chroot-git"
diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index f290805e3ec..6a52f33be93 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -13,6 +13,17 @@ changelog="https://ccache.dev/releasenotes.html"
distfiles="https://github.com/ccache/ccache/releases/download/v${version}/${pkgname}-${version}.tar.xz"
checksum=ac1b82fe0a5e39905945c4d68fcb24bd0f32344869faf647a1b8d31e544dcb88
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
+
+pre_configure() {
+ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ vsed -i src/CMakeLists.txt \
+ -e "/add_library/a target_link_libraries(ccache_lib PRIVATE atomic)"
+ fi
+}
+
post_install() {
vmkdir usr/lib/ccache/bin
# clang
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: ccache: update to 4.0
2020-10-18 20:38 [PR PATCH] ccache: update to 4.0 pullmoll
` (3 preceding siblings ...)
2020-10-19 4:56 ` pullmoll
@ 2020-10-20 11:19 ` pullmoll
2020-10-20 11:28 ` sgn
` (15 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: pullmoll @ 2020-10-20 11:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 375 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/25724#issuecomment-712779372
Comment:
FYI working on a `chroot-cmake` package. It builds but I need to strip it down to the required stuff.
I wonder if we should make `expat` a `bootstrap=yes` package.
`cmake` depends on it and it's simple enough, i.e. no dependencies.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: ccache: update to 4.0
2020-10-18 20:38 [PR PATCH] ccache: update to 4.0 pullmoll
` (4 preceding siblings ...)
2020-10-20 11:19 ` pullmoll
@ 2020-10-20 11:28 ` sgn
2020-10-20 11:31 ` sgn
` (14 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: sgn @ 2020-10-20 11:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 241 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/25724#issuecomment-712784049
Comment:
I also have a working `chroot-cmake`, but with vendored `expat`. Not sure about bootstrap=yes for expat.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: ccache: update to 4.0
2020-10-18 20:38 [PR PATCH] ccache: update to 4.0 pullmoll
` (5 preceding siblings ...)
2020-10-20 11:28 ` sgn
@ 2020-10-20 11:31 ` sgn
2020-10-20 11:34 ` sgn
` (13 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: sgn @ 2020-10-20 11:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 342 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/25724#issuecomment-712784049
Comment:
I also have a working `chroot-cmake`, but with vendored `expat`. Not sure about bootstrap=yes for expat.
---
I'm trying to see if the bootstrapping cmake (the one generated by configure script) usable
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: ccache: update to 4.0
2020-10-18 20:38 [PR PATCH] ccache: update to 4.0 pullmoll
` (6 preceding siblings ...)
2020-10-20 11:31 ` sgn
@ 2020-10-20 11:34 ` sgn
2020-10-20 11:42 ` [PR PATCH] [Updated] " pullmoll
` (12 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: sgn @ 2020-10-20 11:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 343 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/25724#issuecomment-712784049
Comment:
I also have a working `chroot-cmake`, but with vendored `expat`. Not sure about bootstrap=yes for expat.
---
~I'm trying to see if the bootstrapping cmake (the one generated by configure script) usable~
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] ccache: update to 4.0
2020-10-18 20:38 [PR PATCH] ccache: update to 4.0 pullmoll
` (7 preceding siblings ...)
2020-10-20 11:34 ` sgn
@ 2020-10-20 11:42 ` pullmoll
2020-10-20 11:45 ` pullmoll
` (11 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: pullmoll @ 2020-10-20 11:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 651 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages ccache
https://github.com/void-linux/void-packages/pull/25724
ccache: update to 4.0
This release changes from using autoconf to cmake which is why
we need to remove the bootstrap=yes (N.B.: cmake is not bootstrap=yes).
I think we cannot turn `cmake` into a `bootstrap=yes` package.
Should we create a (legacy) chroot-ccache with a < 4.0 version?
There seems to be no way to build `ccache` >= 4.0 with just autoconf.
A patch file from https://github.com/void-linux/void-packages/pull/25724.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ccache-25724.patch --]
[-- Type: text/x-diff, Size: 6391 bytes --]
From cca5038d4d686ce7b59c3696fbf678ecc620c76d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 18 Oct 2020 22:01:57 +0200
Subject: [PATCH 1/4] ccache: update to 4.0
This release changes from using autoconf to cmake.
---
srcpkgs/ccache/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 481c4466199..b4a3c9cbb06 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -1,11 +1,10 @@
# Template file for 'ccache'
pkgname=ccache
-version=3.7.12
+version=4.0
revision=1
bootstrap=yes
-build_style=gnu-configure
-make_check_args="CC=gcc"
-makedepends="zlib-devel"
+build_style=cmake
+makedepends="libzstd-devel zlib-devel"
checkdepends="perl"
short_desc="Fast C/C++ Compiler Cache"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -13,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=a02f4e8360dc6618bc494ca35b0ae21cea080f804a4898eab1ad3fcd108eb400
+checksum=ac1b82fe0a5e39905945c4d68fcb24bd0f32344869faf647a1b8d31e544dcb88
post_install() {
vmkdir usr/lib/ccache/bin
From 74d48b99f7ab67e9484b2d4d084bb60514f407ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 20 Oct 2020 13:29:34 +0200
Subject: [PATCH 2/4] New package: chroot-cmake-3.18.2
Required for building ccache>=4.0.
---
srcpkgs/chroot-cmake/template | 42 +++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
create mode 100644 srcpkgs/chroot-cmake/template
diff --git a/srcpkgs/chroot-cmake/template b/srcpkgs/chroot-cmake/template
new file mode 100644
index 00000000000..5ba9719ec29
--- /dev/null
+++ b/srcpkgs/chroot-cmake/template
@@ -0,0 +1,42 @@
+# Template file for 'chroot-cmake'
+pkgname=chroot-cmake
+version=3.18.2
+revision=1
+wrksrc="${pkgname#chroot-}-${version}"
+bootstrap=yes
+build_style=configure
+configure_args="--prefix=/usr
+ --no-system-curl
+ --no-system-expat
+ --no-system-jsoncpp
+ --system-zlib
+ --system-bzip2
+ --system-liblzma
+ --no-system-nghttp2
+ --system-zstd
+ --system-libarchive
+ --no-system-librhash
+ --no-system-libuv
+ ${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}"
+makedepends="libarchive-devel ncurses-devel"
+short_desc="Cross-platform, open-source build system (chroot version)"
+maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+license="LGPL-2.1-or-later, BSD-3-Clause"
+homepage="https://www.cmake.org"
+distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname#chroot-}-${version}.tar.gz"
+checksum=5d4e40fc775d3d828c72e5c45906b4d9b59003c9433ff1b36a1cb552bbd51d7e
+conflicts="cmake>=0"
+
+if [ "$CROSS_BUILD" ]; then
+ build_style=cmake
+ hostmakedepends="gcc-fortran"
+fi
+
+post_install() {
+ rm -rf ${DESTDIR}/usr/share/doc
+ rm -rf ${DESTDIR}/usr/share/cmake-${version%.*}/Help
+ # TODO: strip usr/share/cmake-${version%.*}/Modules/Compiler we don't need
+ vlicense Copyright.txt
+ vlicense Utilities/KWIML/Copyright.txt KWIML-Copyright.txt
+ vlicense Utilities/cmzlib/Copyright.txt cmzlib-Copyright.txt
+}
From c098ed189b3d1d513ce02af35bef188a3aa561cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 20 Oct 2020 13:35:22 +0200
Subject: [PATCH 3/4] build-style cmake: depend only if $CHROOT_READY
---
common/environment/build-style/cmake.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/common/environment/build-style/cmake.sh b/common/environment/build-style/cmake.sh
index 41f758a69a6..5512c902d5d 100644
--- a/common/environment/build-style/cmake.sh
+++ b/common/environment/build-style/cmake.sh
@@ -1 +1,3 @@
-hostmakedepends+=" cmake"
+if [ "$CHROOT_READY" ]; then
+ hostmakedepends+=" cmake"
+fi
From f50fcab834c517d877f82d8b036a908679494c71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 18 Oct 2020 22:03:25 +0200
Subject: [PATCH 4/4] base-chroot: add chroot-cmake dependency
Because ccache >= 4.0 now is built using cmake we need
a chroot-cmake as bootstrap=yes package.
---
srcpkgs/base-chroot/template | 6 +++---
srcpkgs/ccache/template | 11 +++++++++++
srcpkgs/chroot-cmake/template | 2 ++
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/base-chroot/template b/srcpkgs/base-chroot/template
index 78f6d0cc2a1..7f72c945b61 100644
--- a/srcpkgs/base-chroot/template
+++ b/srcpkgs/base-chroot/template
@@ -1,7 +1,7 @@
# Template file for 'base-chroot'
pkgname=base-chroot
version=0.66
-revision=3
+revision=4
bootstrap=yes
build_style=meta
short_desc="Minimal set of packages required for chroot with xbps-src"
@@ -18,5 +18,5 @@ depends+="
base-files binutils gcc gcc-ada libada-devel
patch sed findutils diffutils make gzip coreutils
file bsdtar ccache xbps mpfr ncurses libreadline8
- chroot-bash chroot-grep chroot-gawk chroot-distcc
- chroot-util-linux chroot-git"
+ chroot-bash chroot-grep chroot-gawk chroot-cmake
+ chroot-distcc chroot-util-linux chroot-git"
diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index b4a3c9cbb06..6e109e8ccdb 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -14,6 +14,17 @@ changelog="https://ccache.dev/releasenotes.html"
distfiles="https://github.com/ccache/ccache/releases/download/v${version}/${pkgname}-${version}.tar.xz"
checksum=ac1b82fe0a5e39905945c4d68fcb24bd0f32344869faf647a1b8d31e544dcb88
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
+
+pre_configure() {
+ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ vsed -i src/CMakeLists.txt \
+ -e "/add_library/a target_link_libraries(ccache_lib PRIVATE atomic)"
+ fi
+}
+
post_install() {
vmkdir usr/lib/ccache/bin
# clang
diff --git a/srcpkgs/chroot-cmake/template b/srcpkgs/chroot-cmake/template
index 5ba9719ec29..6d289293845 100644
--- a/srcpkgs/chroot-cmake/template
+++ b/srcpkgs/chroot-cmake/template
@@ -6,6 +6,8 @@ wrksrc="${pkgname#chroot-}-${version}"
bootstrap=yes
build_style=configure
configure_args="--prefix=/usr
+ --mandir=/share/man
+ --docdir=/share/doc/cmake
--no-system-curl
--no-system-expat
--no-system-jsoncpp
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: ccache: update to 4.0
2020-10-18 20:38 [PR PATCH] ccache: update to 4.0 pullmoll
` (8 preceding siblings ...)
2020-10-20 11:42 ` [PR PATCH] [Updated] " pullmoll
@ 2020-10-20 11:45 ` pullmoll
2020-10-20 11:55 ` pullmoll
` (10 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: pullmoll @ 2020-10-20 11:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 400 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/25724#issuecomment-712792212
Comment:
It works with the `--without-system-expat` configure option. Still, using system expat would make sense.
I don't think it's a problem to turn `expat` into `bootstrap=yes`. It's tiny compared to cmake.
Need to strip down chroot-cmake to what we really need.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: ccache: update to 4.0
2020-10-18 20:38 [PR PATCH] ccache: update to 4.0 pullmoll
` (9 preceding siblings ...)
2020-10-20 11:45 ` pullmoll
@ 2020-10-20 11:55 ` pullmoll
2020-10-20 14:19 ` [PR PATCH] [Updated] " pullmoll
` (9 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: pullmoll @ 2020-10-20 11:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 469 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/25724#issuecomment-712796684
Comment:
Oops.. there's a wrong change to `srcpkgs/chroot-cmake/template` in a later commit. Need to sort that out but have to go now.
It might make sense to try and remove unused compilers from the build, if that's possible. Or otherwise strip out what we definitely don't need.
Will take a look into that when I'm back this evening.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] ccache: update to 4.0
2020-10-18 20:38 [PR PATCH] ccache: update to 4.0 pullmoll
` (10 preceding siblings ...)
2020-10-20 11:55 ` pullmoll
@ 2020-10-20 14:19 ` pullmoll
2020-10-20 14:22 ` pullmoll
` (8 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: pullmoll @ 2020-10-20 14:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 651 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages ccache
https://github.com/void-linux/void-packages/pull/25724
ccache: update to 4.0
This release changes from using autoconf to cmake which is why
we need to remove the bootstrap=yes (N.B.: cmake is not bootstrap=yes).
I think we cannot turn `cmake` into a `bootstrap=yes` package.
Should we create a (legacy) chroot-ccache with a < 4.0 version?
There seems to be no way to build `ccache` >= 4.0 with just autoconf.
A patch file from https://github.com/void-linux/void-packages/pull/25724.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ccache-25724.patch --]
[-- Type: text/x-diff, Size: 5980 bytes --]
From cca5038d4d686ce7b59c3696fbf678ecc620c76d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 18 Oct 2020 22:01:57 +0200
Subject: [PATCH 1/4] ccache: update to 4.0
This release changes from using autoconf to cmake.
---
srcpkgs/ccache/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 481c4466199..b4a3c9cbb06 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -1,11 +1,10 @@
# Template file for 'ccache'
pkgname=ccache
-version=3.7.12
+version=4.0
revision=1
bootstrap=yes
-build_style=gnu-configure
-make_check_args="CC=gcc"
-makedepends="zlib-devel"
+build_style=cmake
+makedepends="libzstd-devel zlib-devel"
checkdepends="perl"
short_desc="Fast C/C++ Compiler Cache"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -13,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=a02f4e8360dc6618bc494ca35b0ae21cea080f804a4898eab1ad3fcd108eb400
+checksum=ac1b82fe0a5e39905945c4d68fcb24bd0f32344869faf647a1b8d31e544dcb88
post_install() {
vmkdir usr/lib/ccache/bin
From 0c02e9043f91ea8469d0613f1d2075cf37a7b36f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 20 Oct 2020 13:29:34 +0200
Subject: [PATCH 2/4] New package: chroot-cmake-3.18.2
Required for building ccache>=4.0.
---
srcpkgs/chroot-cmake/template | 44 +++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
create mode 100644 srcpkgs/chroot-cmake/template
diff --git a/srcpkgs/chroot-cmake/template b/srcpkgs/chroot-cmake/template
new file mode 100644
index 00000000000..6d289293845
--- /dev/null
+++ b/srcpkgs/chroot-cmake/template
@@ -0,0 +1,44 @@
+# Template file for 'chroot-cmake'
+pkgname=chroot-cmake
+version=3.18.2
+revision=1
+wrksrc="${pkgname#chroot-}-${version}"
+bootstrap=yes
+build_style=configure
+configure_args="--prefix=/usr
+ --mandir=/share/man
+ --docdir=/share/doc/cmake
+ --no-system-curl
+ --no-system-expat
+ --no-system-jsoncpp
+ --system-zlib
+ --system-bzip2
+ --system-liblzma
+ --no-system-nghttp2
+ --system-zstd
+ --system-libarchive
+ --no-system-librhash
+ --no-system-libuv
+ ${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}"
+makedepends="libarchive-devel ncurses-devel"
+short_desc="Cross-platform, open-source build system (chroot version)"
+maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+license="LGPL-2.1-or-later, BSD-3-Clause"
+homepage="https://www.cmake.org"
+distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname#chroot-}-${version}.tar.gz"
+checksum=5d4e40fc775d3d828c72e5c45906b4d9b59003c9433ff1b36a1cb552bbd51d7e
+conflicts="cmake>=0"
+
+if [ "$CROSS_BUILD" ]; then
+ build_style=cmake
+ hostmakedepends="gcc-fortran"
+fi
+
+post_install() {
+ rm -rf ${DESTDIR}/usr/share/doc
+ rm -rf ${DESTDIR}/usr/share/cmake-${version%.*}/Help
+ # TODO: strip usr/share/cmake-${version%.*}/Modules/Compiler we don't need
+ vlicense Copyright.txt
+ vlicense Utilities/KWIML/Copyright.txt KWIML-Copyright.txt
+ vlicense Utilities/cmzlib/Copyright.txt cmzlib-Copyright.txt
+}
From 7a1e9fa38e6198d8db793997e8b006fa28687a3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 20 Oct 2020 13:35:22 +0200
Subject: [PATCH 3/4] build-style cmake: depend only if $CHROOT_READY
---
common/environment/build-style/cmake.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/common/environment/build-style/cmake.sh b/common/environment/build-style/cmake.sh
index 41f758a69a6..5512c902d5d 100644
--- a/common/environment/build-style/cmake.sh
+++ b/common/environment/build-style/cmake.sh
@@ -1 +1,3 @@
-hostmakedepends+=" cmake"
+if [ "$CHROOT_READY" ]; then
+ hostmakedepends+=" cmake"
+fi
From 3a711123b3a2e7371243ae5d7164579f7d9a8a2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 18 Oct 2020 22:03:25 +0200
Subject: [PATCH 4/4] base-chroot: add chroot-cmake dependency
Because ccache >= 4.0 now is built using cmake we need
a chroot-cmake as bootstrap=yes package.
---
srcpkgs/base-chroot/template | 6 +++---
srcpkgs/ccache/template | 11 +++++++++++
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/base-chroot/template b/srcpkgs/base-chroot/template
index 78f6d0cc2a1..7f72c945b61 100644
--- a/srcpkgs/base-chroot/template
+++ b/srcpkgs/base-chroot/template
@@ -1,7 +1,7 @@
# Template file for 'base-chroot'
pkgname=base-chroot
version=0.66
-revision=3
+revision=4
bootstrap=yes
build_style=meta
short_desc="Minimal set of packages required for chroot with xbps-src"
@@ -18,5 +18,5 @@ depends+="
base-files binutils gcc gcc-ada libada-devel
patch sed findutils diffutils make gzip coreutils
file bsdtar ccache xbps mpfr ncurses libreadline8
- chroot-bash chroot-grep chroot-gawk chroot-distcc
- chroot-util-linux chroot-git"
+ chroot-bash chroot-grep chroot-gawk chroot-cmake
+ chroot-distcc chroot-util-linux chroot-git"
diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index b4a3c9cbb06..6e109e8ccdb 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -14,6 +14,17 @@ changelog="https://ccache.dev/releasenotes.html"
distfiles="https://github.com/ccache/ccache/releases/download/v${version}/${pkgname}-${version}.tar.xz"
checksum=ac1b82fe0a5e39905945c4d68fcb24bd0f32344869faf647a1b8d31e544dcb88
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
+
+pre_configure() {
+ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ vsed -i src/CMakeLists.txt \
+ -e "/add_library/a target_link_libraries(ccache_lib PRIVATE atomic)"
+ fi
+}
+
post_install() {
vmkdir usr/lib/ccache/bin
# clang
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] ccache: update to 4.0
2020-10-18 20:38 [PR PATCH] ccache: update to 4.0 pullmoll
` (11 preceding siblings ...)
2020-10-20 14:19 ` [PR PATCH] [Updated] " pullmoll
@ 2020-10-20 14:22 ` pullmoll
2020-10-20 14:54 ` [PR REVIEW] " sgn
` (7 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: pullmoll @ 2020-10-20 14:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 651 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages ccache
https://github.com/void-linux/void-packages/pull/25724
ccache: update to 4.0
This release changes from using autoconf to cmake which is why
we need to remove the bootstrap=yes (N.B.: cmake is not bootstrap=yes).
I think we cannot turn `cmake` into a `bootstrap=yes` package.
Should we create a (legacy) chroot-ccache with a < 4.0 version?
There seems to be no way to build `ccache` >= 4.0 with just autoconf.
A patch file from https://github.com/void-linux/void-packages/pull/25724.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ccache-25724.patch --]
[-- Type: text/x-diff, Size: 5477 bytes --]
From 29c5d5afd7574c6796e606be5e561ccf3e4837f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 18 Oct 2020 22:01:57 +0200
Subject: [PATCH 1/4] ccache: update to 4.0
This release changes from using autoconf to cmake.
---
srcpkgs/ccache/template | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 481c4466199..6e109e8ccdb 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -1,11 +1,10 @@
# Template file for 'ccache'
pkgname=ccache
-version=3.7.12
+version=4.0
revision=1
bootstrap=yes
-build_style=gnu-configure
-make_check_args="CC=gcc"
-makedepends="zlib-devel"
+build_style=cmake
+makedepends="libzstd-devel zlib-devel"
checkdepends="perl"
short_desc="Fast C/C++ Compiler Cache"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -13,7 +12,18 @@ 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=a02f4e8360dc6618bc494ca35b0ae21cea080f804a4898eab1ad3fcd108eb400
+checksum=ac1b82fe0a5e39905945c4d68fcb24bd0f32344869faf647a1b8d31e544dcb88
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
+
+pre_configure() {
+ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ vsed -i src/CMakeLists.txt \
+ -e "/add_library/a target_link_libraries(ccache_lib PRIVATE atomic)"
+ fi
+}
post_install() {
vmkdir usr/lib/ccache/bin
From db828f310ca14194b5d7b2b072876c12ed596fa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 20 Oct 2020 13:29:34 +0200
Subject: [PATCH 2/4] New package: chroot-cmake-3.18.2
Required for building ccache>=4.0.
---
srcpkgs/chroot-cmake/template | 44 +++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
create mode 100644 srcpkgs/chroot-cmake/template
diff --git a/srcpkgs/chroot-cmake/template b/srcpkgs/chroot-cmake/template
new file mode 100644
index 00000000000..6d289293845
--- /dev/null
+++ b/srcpkgs/chroot-cmake/template
@@ -0,0 +1,44 @@
+# Template file for 'chroot-cmake'
+pkgname=chroot-cmake
+version=3.18.2
+revision=1
+wrksrc="${pkgname#chroot-}-${version}"
+bootstrap=yes
+build_style=configure
+configure_args="--prefix=/usr
+ --mandir=/share/man
+ --docdir=/share/doc/cmake
+ --no-system-curl
+ --no-system-expat
+ --no-system-jsoncpp
+ --system-zlib
+ --system-bzip2
+ --system-liblzma
+ --no-system-nghttp2
+ --system-zstd
+ --system-libarchive
+ --no-system-librhash
+ --no-system-libuv
+ ${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}"
+makedepends="libarchive-devel ncurses-devel"
+short_desc="Cross-platform, open-source build system (chroot version)"
+maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+license="LGPL-2.1-or-later, BSD-3-Clause"
+homepage="https://www.cmake.org"
+distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname#chroot-}-${version}.tar.gz"
+checksum=5d4e40fc775d3d828c72e5c45906b4d9b59003c9433ff1b36a1cb552bbd51d7e
+conflicts="cmake>=0"
+
+if [ "$CROSS_BUILD" ]; then
+ build_style=cmake
+ hostmakedepends="gcc-fortran"
+fi
+
+post_install() {
+ rm -rf ${DESTDIR}/usr/share/doc
+ rm -rf ${DESTDIR}/usr/share/cmake-${version%.*}/Help
+ # TODO: strip usr/share/cmake-${version%.*}/Modules/Compiler we don't need
+ vlicense Copyright.txt
+ vlicense Utilities/KWIML/Copyright.txt KWIML-Copyright.txt
+ vlicense Utilities/cmzlib/Copyright.txt cmzlib-Copyright.txt
+}
From fdcbfb2675f8de45919fcaff79ea2a21c72c3210 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 20 Oct 2020 13:35:22 +0200
Subject: [PATCH 3/4] build-style cmake: depend only if $CHROOT_READY
---
common/environment/build-style/cmake.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/common/environment/build-style/cmake.sh b/common/environment/build-style/cmake.sh
index 41f758a69a6..5512c902d5d 100644
--- a/common/environment/build-style/cmake.sh
+++ b/common/environment/build-style/cmake.sh
@@ -1 +1,3 @@
-hostmakedepends+=" cmake"
+if [ "$CHROOT_READY" ]; then
+ hostmakedepends+=" cmake"
+fi
From 69105214d430ec412171a107f2234288ed92efe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 18 Oct 2020 22:03:25 +0200
Subject: [PATCH 4/4] base-chroot: add chroot-cmake dependency
Because ccache >= 4.0 now is built using cmake we need
a chroot-cmake as bootstrap=yes package.
---
srcpkgs/base-chroot/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/base-chroot/template b/srcpkgs/base-chroot/template
index 78f6d0cc2a1..7f72c945b61 100644
--- a/srcpkgs/base-chroot/template
+++ b/srcpkgs/base-chroot/template
@@ -1,7 +1,7 @@
# Template file for 'base-chroot'
pkgname=base-chroot
version=0.66
-revision=3
+revision=4
bootstrap=yes
build_style=meta
short_desc="Minimal set of packages required for chroot with xbps-src"
@@ -18,5 +18,5 @@ depends+="
base-files binutils gcc gcc-ada libada-devel
patch sed findutils diffutils make gzip coreutils
file bsdtar ccache xbps mpfr ncurses libreadline8
- chroot-bash chroot-grep chroot-gawk chroot-distcc
- chroot-util-linux chroot-git"
+ chroot-bash chroot-grep chroot-gawk chroot-cmake
+ chroot-distcc chroot-util-linux chroot-git"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR REVIEW] ccache: update to 4.0
2020-10-18 20:38 [PR PATCH] ccache: update to 4.0 pullmoll
` (12 preceding siblings ...)
2020-10-20 14:22 ` pullmoll
@ 2020-10-20 14:54 ` sgn
2020-10-20 14:57 ` [PR PATCH] [Updated] " pullmoll
` (6 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: sgn @ 2020-10-20 14:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 180 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/25724#discussion_r508569953
Comment:
I don't think it need `ncurses-devel`
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] ccache: update to 4.0
2020-10-18 20:38 [PR PATCH] ccache: update to 4.0 pullmoll
` (13 preceding siblings ...)
2020-10-20 14:54 ` [PR REVIEW] " sgn
@ 2020-10-20 14:57 ` pullmoll
2020-10-20 14:59 ` pullmoll
` (5 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: pullmoll @ 2020-10-20 14:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 651 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages ccache
https://github.com/void-linux/void-packages/pull/25724
ccache: update to 4.0
This release changes from using autoconf to cmake which is why
we need to remove the bootstrap=yes (N.B.: cmake is not bootstrap=yes).
I think we cannot turn `cmake` into a `bootstrap=yes` package.
Should we create a (legacy) chroot-ccache with a < 4.0 version?
There seems to be no way to build `ccache` >= 4.0 with just autoconf.
A patch file from https://github.com/void-linux/void-packages/pull/25724.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ccache-25724.patch --]
[-- Type: text/x-diff, Size: 7293 bytes --]
From 29c5d5afd7574c6796e606be5e561ccf3e4837f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 18 Oct 2020 22:01:57 +0200
Subject: [PATCH 1/6] ccache: update to 4.0
This release changes from using autoconf to cmake.
---
srcpkgs/ccache/template | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 481c4466199..6e109e8ccdb 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -1,11 +1,10 @@
# Template file for 'ccache'
pkgname=ccache
-version=3.7.12
+version=4.0
revision=1
bootstrap=yes
-build_style=gnu-configure
-make_check_args="CC=gcc"
-makedepends="zlib-devel"
+build_style=cmake
+makedepends="libzstd-devel zlib-devel"
checkdepends="perl"
short_desc="Fast C/C++ Compiler Cache"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -13,7 +12,18 @@ 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=a02f4e8360dc6618bc494ca35b0ae21cea080f804a4898eab1ad3fcd108eb400
+checksum=ac1b82fe0a5e39905945c4d68fcb24bd0f32344869faf647a1b8d31e544dcb88
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
+
+pre_configure() {
+ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ vsed -i src/CMakeLists.txt \
+ -e "/add_library/a target_link_libraries(ccache_lib PRIVATE atomic)"
+ fi
+}
post_install() {
vmkdir usr/lib/ccache/bin
From aebb11c7b6dde192d5eeeecf1dcc09b60f81cfb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 20 Oct 2020 16:54:52 +0200
Subject: [PATCH 2/6] expat: make it a bootstrap=yes package
---
srcpkgs/expat/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/expat/template b/srcpkgs/expat/template
index 3c94508f4d5..ccff695dfac 100644
--- a/srcpkgs/expat/template
+++ b/srcpkgs/expat/template
@@ -1,7 +1,8 @@
# Template file for 'expat'
pkgname=expat
version=2.2.10
-revision=1
+revision=2
+bootstrap=yes
build_style=gnu-configure
short_desc="XML parser library written in C"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From 6dba86952be1bbbbde58a63af8fdd8afd2cd3e57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 20 Oct 2020 16:24:51 +0200
Subject: [PATCH 3/6] cmake: conflict w/ chroot-cmake
---
srcpkgs/cmake/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 808d69caec6..f230b49520b 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,7 +1,7 @@
# Template file for 'cmake'
pkgname=cmake
version=3.18.2
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --mandir=/share/man --docdir=/share/doc/cmake
--system-libs --no-system-jsoncpp ${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}"
@@ -15,6 +15,7 @@ license="LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
checksum=5d4e40fc775d3d828c72e5c45906b4d9b59003c9433ff1b36a1cb552bbd51d7e
+conflicts="chroot-cmake>=0"
if [ "$CROSS_BUILD" ]; then
# XXX ugly :-)
From c04435edf08e91a7421891ff818f836f80a920ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 20 Oct 2020 13:29:34 +0200
Subject: [PATCH 4/6] New package: chroot-cmake-3.18.2
Required for building ccache>=4.0.
---
srcpkgs/chroot-cmake/template | 44 +++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
create mode 100644 srcpkgs/chroot-cmake/template
diff --git a/srcpkgs/chroot-cmake/template b/srcpkgs/chroot-cmake/template
new file mode 100644
index 00000000000..b108452a5be
--- /dev/null
+++ b/srcpkgs/chroot-cmake/template
@@ -0,0 +1,44 @@
+# Template file for 'chroot-cmake'
+pkgname=chroot-cmake
+version=3.18.2
+revision=1
+wrksrc="${pkgname#chroot-}-${version}"
+bootstrap=yes
+build_style=configure
+configure_args="--prefix=/usr
+ --mandir=/share/man
+ --docdir=/share/doc/cmake
+ --no-system-curl
+ --system-expat
+ --no-system-jsoncpp
+ --system-zlib
+ --system-bzip2
+ --system-liblzma
+ --no-system-nghttp2
+ --system-zstd
+ --system-libarchive
+ --no-system-librhash
+ --no-system-libuv
+ ${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}"
+makedepends="libarchive-devel expat-devel ncurses-devel"
+short_desc="Cross-platform, open-source build system (chroot version)"
+maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+license="LGPL-2.1-or-later, BSD-3-Clause"
+homepage="https://www.cmake.org"
+distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname#chroot-}-${version}.tar.gz"
+checksum=5d4e40fc775d3d828c72e5c45906b4d9b59003c9433ff1b36a1cb552bbd51d7e
+conflicts="cmake>=0"
+
+if [ "$CROSS_BUILD" ]; then
+ build_style=cmake
+ hostmakedepends="gcc-fortran"
+fi
+
+post_install() {
+ rm -rf ${DESTDIR}/usr/share/doc
+ rm -rf ${DESTDIR}/usr/share/cmake-${version%.*}/Help
+ # TODO: strip usr/share/cmake-${version%.*}/Modules/Compiler we don't need
+ vlicense Copyright.txt
+ vlicense Utilities/KWIML/Copyright.txt KWIML-Copyright.txt
+ vlicense Utilities/cmzlib/Copyright.txt cmzlib-Copyright.txt
+}
From 6a926b3a4377ca2b9942854ac1d3dcf1c412656c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 20 Oct 2020 13:35:22 +0200
Subject: [PATCH 5/6] build-style cmake: depend only if $CHROOT_READY
---
common/environment/build-style/cmake.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/common/environment/build-style/cmake.sh b/common/environment/build-style/cmake.sh
index 41f758a69a6..5512c902d5d 100644
--- a/common/environment/build-style/cmake.sh
+++ b/common/environment/build-style/cmake.sh
@@ -1 +1,3 @@
-hostmakedepends+=" cmake"
+if [ "$CHROOT_READY" ]; then
+ hostmakedepends+=" cmake"
+fi
From edaba738f187425aa7f2e07ff9d860cda7db30bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 18 Oct 2020 22:03:25 +0200
Subject: [PATCH 6/6] base-chroot: add chroot-cmake dependency
Because ccache >= 4.0 now is built using cmake we need
a chroot-cmake as bootstrap=yes package.
---
srcpkgs/base-chroot/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/base-chroot/template b/srcpkgs/base-chroot/template
index 78f6d0cc2a1..7f72c945b61 100644
--- a/srcpkgs/base-chroot/template
+++ b/srcpkgs/base-chroot/template
@@ -1,7 +1,7 @@
# Template file for 'base-chroot'
pkgname=base-chroot
version=0.66
-revision=3
+revision=4
bootstrap=yes
build_style=meta
short_desc="Minimal set of packages required for chroot with xbps-src"
@@ -18,5 +18,5 @@ depends+="
base-files binutils gcc gcc-ada libada-devel
patch sed findutils diffutils make gzip coreutils
file bsdtar ccache xbps mpfr ncurses libreadline8
- chroot-bash chroot-grep chroot-gawk chroot-distcc
- chroot-util-linux chroot-git"
+ chroot-bash chroot-grep chroot-gawk chroot-cmake
+ chroot-distcc chroot-util-linux chroot-git"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] ccache: update to 4.0
2020-10-18 20:38 [PR PATCH] ccache: update to 4.0 pullmoll
` (14 preceding siblings ...)
2020-10-20 14:57 ` [PR PATCH] [Updated] " pullmoll
@ 2020-10-20 14:59 ` pullmoll
2020-10-20 15:00 ` pullmoll
` (4 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: pullmoll @ 2020-10-20 14:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 651 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages ccache
https://github.com/void-linux/void-packages/pull/25724
ccache: update to 4.0
This release changes from using autoconf to cmake which is why
we need to remove the bootstrap=yes (N.B.: cmake is not bootstrap=yes).
I think we cannot turn `cmake` into a `bootstrap=yes` package.
Should we create a (legacy) chroot-ccache with a < 4.0 version?
There seems to be no way to build `ccache` >= 4.0 with just autoconf.
A patch file from https://github.com/void-linux/void-packages/pull/25724.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ccache-25724.patch --]
[-- Type: text/x-diff, Size: 7279 bytes --]
From 29c5d5afd7574c6796e606be5e561ccf3e4837f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 18 Oct 2020 22:01:57 +0200
Subject: [PATCH 1/6] ccache: update to 4.0
This release changes from using autoconf to cmake.
---
srcpkgs/ccache/template | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 481c4466199..6e109e8ccdb 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -1,11 +1,10 @@
# Template file for 'ccache'
pkgname=ccache
-version=3.7.12
+version=4.0
revision=1
bootstrap=yes
-build_style=gnu-configure
-make_check_args="CC=gcc"
-makedepends="zlib-devel"
+build_style=cmake
+makedepends="libzstd-devel zlib-devel"
checkdepends="perl"
short_desc="Fast C/C++ Compiler Cache"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -13,7 +12,18 @@ 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=a02f4e8360dc6618bc494ca35b0ae21cea080f804a4898eab1ad3fcd108eb400
+checksum=ac1b82fe0a5e39905945c4d68fcb24bd0f32344869faf647a1b8d31e544dcb88
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
+
+pre_configure() {
+ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ vsed -i src/CMakeLists.txt \
+ -e "/add_library/a target_link_libraries(ccache_lib PRIVATE atomic)"
+ fi
+}
post_install() {
vmkdir usr/lib/ccache/bin
From aebb11c7b6dde192d5eeeecf1dcc09b60f81cfb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 20 Oct 2020 16:54:52 +0200
Subject: [PATCH 2/6] expat: make it a bootstrap=yes package
---
srcpkgs/expat/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/expat/template b/srcpkgs/expat/template
index 3c94508f4d5..ccff695dfac 100644
--- a/srcpkgs/expat/template
+++ b/srcpkgs/expat/template
@@ -1,7 +1,8 @@
# Template file for 'expat'
pkgname=expat
version=2.2.10
-revision=1
+revision=2
+bootstrap=yes
build_style=gnu-configure
short_desc="XML parser library written in C"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From 6dba86952be1bbbbde58a63af8fdd8afd2cd3e57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 20 Oct 2020 16:24:51 +0200
Subject: [PATCH 3/6] cmake: conflict w/ chroot-cmake
---
srcpkgs/cmake/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 808d69caec6..f230b49520b 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,7 +1,7 @@
# Template file for 'cmake'
pkgname=cmake
version=3.18.2
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --mandir=/share/man --docdir=/share/doc/cmake
--system-libs --no-system-jsoncpp ${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}"
@@ -15,6 +15,7 @@ license="LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
checksum=5d4e40fc775d3d828c72e5c45906b4d9b59003c9433ff1b36a1cb552bbd51d7e
+conflicts="chroot-cmake>=0"
if [ "$CROSS_BUILD" ]; then
# XXX ugly :-)
From 92b1f7f72a06dfc3010eb0cfe30d8669f10b09e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 20 Oct 2020 13:29:34 +0200
Subject: [PATCH 4/6] New package: chroot-cmake-3.18.2
Required for building ccache>=4.0.
---
srcpkgs/chroot-cmake/template | 44 +++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
create mode 100644 srcpkgs/chroot-cmake/template
diff --git a/srcpkgs/chroot-cmake/template b/srcpkgs/chroot-cmake/template
new file mode 100644
index 00000000000..607639aff7c
--- /dev/null
+++ b/srcpkgs/chroot-cmake/template
@@ -0,0 +1,44 @@
+# Template file for 'chroot-cmake'
+pkgname=chroot-cmake
+version=3.18.2
+revision=1
+wrksrc="${pkgname#chroot-}-${version}"
+bootstrap=yes
+build_style=configure
+configure_args="--prefix=/usr
+ --mandir=/share/man
+ --docdir=/share/doc/cmake
+ --no-system-curl
+ --system-expat
+ --no-system-jsoncpp
+ --system-zlib
+ --system-bzip2
+ --system-liblzma
+ --no-system-nghttp2
+ --system-zstd
+ --system-libarchive
+ --no-system-librhash
+ --no-system-libuv
+ ${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}"
+makedepends="libarchive-devel expat-devel"
+short_desc="Cross-platform, open-source build system (chroot version)"
+maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+license="LGPL-2.1-or-later, BSD-3-Clause"
+homepage="https://www.cmake.org"
+distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname#chroot-}-${version}.tar.gz"
+checksum=5d4e40fc775d3d828c72e5c45906b4d9b59003c9433ff1b36a1cb552bbd51d7e
+conflicts="cmake>=0"
+
+if [ "$CROSS_BUILD" ]; then
+ build_style=cmake
+ hostmakedepends="gcc-fortran"
+fi
+
+post_install() {
+ rm -rf ${DESTDIR}/usr/share/doc
+ rm -rf ${DESTDIR}/usr/share/cmake-${version%.*}/Help
+ # TODO: strip usr/share/cmake-${version%.*}/Modules/Compiler we don't need
+ vlicense Copyright.txt
+ vlicense Utilities/KWIML/Copyright.txt KWIML-Copyright.txt
+ vlicense Utilities/cmzlib/Copyright.txt cmzlib-Copyright.txt
+}
From 3ef28050e9e42a80691343fa8fb72d6763348a3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 20 Oct 2020 13:35:22 +0200
Subject: [PATCH 5/6] build-style cmake: depend only if $CHROOT_READY
---
common/environment/build-style/cmake.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/common/environment/build-style/cmake.sh b/common/environment/build-style/cmake.sh
index 41f758a69a6..5512c902d5d 100644
--- a/common/environment/build-style/cmake.sh
+++ b/common/environment/build-style/cmake.sh
@@ -1 +1,3 @@
-hostmakedepends+=" cmake"
+if [ "$CHROOT_READY" ]; then
+ hostmakedepends+=" cmake"
+fi
From 04e95b674634d8f7a4405e340f7f18f82150afa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 18 Oct 2020 22:03:25 +0200
Subject: [PATCH 6/6] base-chroot: add chroot-cmake dependency
Because ccache >= 4.0 now is built using cmake we need
a chroot-cmake as bootstrap=yes package.
---
srcpkgs/base-chroot/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/base-chroot/template b/srcpkgs/base-chroot/template
index 78f6d0cc2a1..7f72c945b61 100644
--- a/srcpkgs/base-chroot/template
+++ b/srcpkgs/base-chroot/template
@@ -1,7 +1,7 @@
# Template file for 'base-chroot'
pkgname=base-chroot
version=0.66
-revision=3
+revision=4
bootstrap=yes
build_style=meta
short_desc="Minimal set of packages required for chroot with xbps-src"
@@ -18,5 +18,5 @@ depends+="
base-files binutils gcc gcc-ada libada-devel
patch sed findutils diffutils make gzip coreutils
file bsdtar ccache xbps mpfr ncurses libreadline8
- chroot-bash chroot-grep chroot-gawk chroot-distcc
- chroot-util-linux chroot-git"
+ chroot-bash chroot-grep chroot-gawk chroot-cmake
+ chroot-distcc chroot-util-linux chroot-git"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: ccache: update to 4.0
2020-10-18 20:38 [PR PATCH] ccache: update to 4.0 pullmoll
` (15 preceding siblings ...)
2020-10-20 14:59 ` pullmoll
@ 2020-10-20 15:00 ` pullmoll
2020-10-20 15:05 ` pullmoll
` (3 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: pullmoll @ 2020-10-20 15:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 205 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/25724#issuecomment-712916559
Comment:
Now let's see if it builds w/o ncurses and with system expat...
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: ccache: update to 4.0
2020-10-18 20:38 [PR PATCH] ccache: update to 4.0 pullmoll
` (16 preceding siblings ...)
2020-10-20 15:00 ` pullmoll
@ 2020-10-20 15:05 ` pullmoll
2020-10-20 15:11 ` sgn
` (2 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: pullmoll @ 2020-10-20 15:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 245 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/25724#issuecomment-712916559
Comment:
Now let's see if it builds w/o ncurses and with system expat...
Also trying a `x86_64` bootstrap here.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: ccache: update to 4.0
2020-10-18 20:38 [PR PATCH] ccache: update to 4.0 pullmoll
` (17 preceding siblings ...)
2020-10-20 15:05 ` pullmoll
@ 2020-10-20 15:11 ` sgn
2020-10-20 15:30 ` pullmoll
2020-10-20 15:30 ` [PR PATCH] [Closed]: " pullmoll
20 siblings, 0 replies; 22+ messages in thread
From: sgn @ 2020-10-20 15:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 284 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/25724#issuecomment-712924224
Comment:
@pullmoll I've draft another approach for `chroot-cmake`. Please take a look in my approach. https://github.com/void-linux/void-packages/pull/25753
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: ccache: update to 4.0
2020-10-18 20:38 [PR PATCH] ccache: update to 4.0 pullmoll
` (18 preceding siblings ...)
2020-10-20 15:11 ` sgn
@ 2020-10-20 15:30 ` pullmoll
2020-10-20 15:30 ` [PR PATCH] [Closed]: " pullmoll
20 siblings, 0 replies; 22+ messages in thread
From: pullmoll @ 2020-10-20 15:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 168 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/25724#issuecomment-712937622
Comment:
Closing in favor of #25753
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Closed]: ccache: update to 4.0
2020-10-18 20:38 [PR PATCH] ccache: update to 4.0 pullmoll
` (19 preceding siblings ...)
2020-10-20 15:30 ` pullmoll
@ 2020-10-20 15:30 ` pullmoll
20 siblings, 0 replies; 22+ messages in thread
From: pullmoll @ 2020-10-20 15:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 494 bytes --]
There's a closed pull request on the void-packages repository
ccache: update to 4.0
https://github.com/void-linux/void-packages/pull/25724
Description:
This release changes from using autoconf to cmake which is why
we need to remove the bootstrap=yes (N.B.: cmake is not bootstrap=yes).
I think we cannot turn `cmake` into a `bootstrap=yes` package.
Should we create a (legacy) chroot-ccache with a < 4.0 version?
There seems to be no way to build `ccache` >= 4.0 with just autoconf.
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2020-10-20 15:30 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-18 20:38 [PR PATCH] ccache: update to 4.0 pullmoll
2020-10-19 1:59 ` sgn
2020-10-19 4:21 ` pullmoll
2020-10-19 4:52 ` [PR PATCH] [Updated] " pullmoll
2020-10-19 4:56 ` pullmoll
2020-10-20 11:19 ` pullmoll
2020-10-20 11:28 ` sgn
2020-10-20 11:31 ` sgn
2020-10-20 11:34 ` sgn
2020-10-20 11:42 ` [PR PATCH] [Updated] " pullmoll
2020-10-20 11:45 ` pullmoll
2020-10-20 11:55 ` pullmoll
2020-10-20 14:19 ` [PR PATCH] [Updated] " pullmoll
2020-10-20 14:22 ` pullmoll
2020-10-20 14:54 ` [PR REVIEW] " sgn
2020-10-20 14:57 ` [PR PATCH] [Updated] " pullmoll
2020-10-20 14:59 ` pullmoll
2020-10-20 15:00 ` pullmoll
2020-10-20 15:05 ` pullmoll
2020-10-20 15:11 ` sgn
2020-10-20 15:30 ` pullmoll
2020-10-20 15:30 ` [PR PATCH] [Closed]: " pullmoll
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).