From cca5038d4d686ce7b59c3696fbf678ecc620c76d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= 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 " @@ -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?= 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 " +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?= 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?= 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