From: pullmoll <pullmoll@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] ccache: update to 4.0
Date: Tue, 20 Oct 2020 13:42:05 +0200 [thread overview]
Message-ID: <20201020114205.OYsezgCPfq5GbyFIMIFBMYiR_DOi3cwrFKWcgu5K5Uo@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25724@inbox.vuxu.org>
[-- 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
next prev parent reply other threads:[~2020-10-20 11:42 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-18 20:38 [PR PATCH] " 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 ` pullmoll [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201020114205.OYsezgCPfq5GbyFIMIFBMYiR_DOi3cwrFKWcgu5K5Uo@z \
--to=pullmoll@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).