From 6edcc8be7fa0a5f7193787b0a5944b0e8a8f11fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 6 Jun 2021 09:01:34 +0700 Subject: [PATCH 1/7] base-chroot: remove ccache from bootstrap --- srcpkgs/base-chroot/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/base-chroot/template b/srcpkgs/base-chroot/template index 78f6d0cc2a1d..5003e3c37247 100644 --- a/srcpkgs/base-chroot/template +++ b/srcpkgs/base-chroot/template @@ -17,6 +17,10 @@ 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" + +if [ "$CHROOT_READY" ]; then + depends+=" ccache" +fi From 9c6484f9ccf35733cabfece05a2ad8a3f923b7c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 6 Jun 2021 09:03:17 +0700 Subject: [PATCH 2/7] ccache: remove from bootstrap --- srcpkgs/ccache/template | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template index bb9dde861f67..5e7fbf5642c5 100644 --- a/srcpkgs/ccache/template +++ b/srcpkgs/ccache/template @@ -2,9 +2,9 @@ pkgname=ccache version=4.2.1 revision=1 -bootstrap=yes build_style=cmake configure_args="-DENABLE_TESTING=OFF" +hostmakedepends="asciidoc perl" makedepends="libzstd-devel zlib-devel" short_desc="Fast C/C++ Compiler Cache" maintainer="Enno Boland " @@ -14,15 +14,7 @@ changelog="https://ccache.dev/releasenotes.html" distfiles="https://github.com/ccache/ccache/releases/download/v${version}/${pkgname}-${version}.tar.xz" checksum=9d6ba1cdefdc690401f404b747d81a9a1802b17af4235815866b7620d980477e -if [ -z "$CHROOT_READY" ]; then - hostmakedepends="cmake-bootstrap" - export CMAKE_GENERATOR="Unix Makefiles" - make_cmd="make" -else - hostmakedepends="asciidoc perl" -fi - -if [ -n "$CHROOT_READY" ] && [ -n "$XBPS_CHECK_PKGS" ]; then +if [ -n "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DENABLE_TESTING=ON" fi From acd2ef9cad5d07ec83e8ca15f2548f763250b6dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 6 Jun 2021 09:58:55 +0700 Subject: [PATCH 3/7] cmake: rebuild without cmake-bootstrap --- srcpkgs/cmake/template | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template index 13d19b296172..e1413c5a74cc 100644 --- a/srcpkgs/cmake/template +++ b/srcpkgs/cmake/template @@ -1,13 +1,12 @@ # Template file for 'cmake' pkgname=cmake version=3.20.2 -revision=1 -build_style=cmake -configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake - -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DKWSYS_LFS_WORKS=1" +revision=2 +build_style=configure +configure_args="--prefix=/usr --mandir=/share/man --docdir=/share/doc/cmake + --system-libs ${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}" make_check_target=test -make_cmd=make -hostmakedepends="cmake-bootstrap gcc-fortran" +hostmakedepends="gcc-fortran" makedepends="expat-devel libarchive-devel libcurl-devel libuv-devel ncurses-devel rhash-devel jsoncpp-devel" checkdepends="pax pkg-config" @@ -17,15 +16,13 @@ license="BSD-3-Clause, ICU" homepage="https://www.cmake.org" distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz" checksum=aecf6ecb975179eb3bb6a4a50cae192d41e92b9372b02300f9e8f1d5f559544e +replaces="cmake-bootstrap>=0" -export CMAKE_GENERATOR="Unix Makefiles" - -pre_check() { - # use ctest of this build instead of requirig cmake to test cmake... - vsed -i "${wrksrc}/build/Makefile" \ - -e 's!/usr/bin/ctest!ctest!g' - export PATH="${wrksrc}/build/bin:$PATH" -} +if [ "$CROSS_BUILD" ]; then + build_style=cmake + configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake + -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DKWSYS_LFS_WORKS=1" +fi post_install() { rm -rf ${DESTDIR}/usr/share/doc/cmake From a85779d65bff100125d63c8c32e2a813213c4c50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 6 Jun 2021 10:00:33 +0700 Subject: [PATCH 4/7] build-style/cmake: always depends on cmake in host All packages that build with cmake build-style switched from cmake-bootstrap to cmake. Remove the conditional. --- common/environment/build-style/cmake.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/common/environment/build-style/cmake.sh b/common/environment/build-style/cmake.sh index 4306b7b3882b..9de8567f4664 100644 --- a/common/environment/build-style/cmake.sh +++ b/common/environment/build-style/cmake.sh @@ -1,7 +1,5 @@ if [ "$CHROOT_READY" ]; then - if [[ "$hostmakedepends" != *"cmake-bootstrap"* ]]; then - hostmakedepends+=" cmake" - fi + hostmakedepends+=" cmake" if [ "${make_cmd:-ninja}" = ninja ]; then hostmakedepends+=" ninja" fi From 7a212799f40c7541dbcbd26e3207e1c01092b651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 6 Jun 2021 10:02:52 +0700 Subject: [PATCH 5/7] cmake-bootstrap: remove package replaced by cmake. --- .../0002-Fix-undefined-cmake_doc_dir.patch | 18 ------ srcpkgs/cmake-bootstrap/template | 58 ------------------- srcpkgs/cmake-bootstrap/update | 1 - 3 files changed, 77 deletions(-) delete mode 100644 srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-cmake_doc_dir.patch delete mode 100644 srcpkgs/cmake-bootstrap/template delete mode 120000 srcpkgs/cmake-bootstrap/update diff --git a/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-cmake_doc_dir.patch b/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-cmake_doc_dir.patch deleted file mode 100644 index efbbfc418679..000000000000 --- a/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-cmake_doc_dir.patch +++ /dev/null @@ -1,18 +0,0 @@ -Gives CMAKE_DOC_DIR undefined, this is half-baked cmake -so don't truly need ---- -diff --git Source/cmSystemTools.cxx Source/cmSystemTools.cxx -index 747cedc..7c516d8 100644 ---- Source/cmSystemTools.cxx -+++ Source/cmSystemTools.cxx -@@ -2171,10 +2171,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0) - std::string const prefix = - exe_dir.substr(0, exe_dir.size() - cmStrLen(CMAKE_BIN_DIR)); - cmSystemToolsCMakeRoot = cmStrCat(prefix, CMAKE_DATA_DIR); -- if (cmSystemTools::FileExists( -- cmStrCat(prefix, CMAKE_DOC_DIR "/html/index.html"))) { -- cmSystemToolsHTMLDoc = cmStrCat(prefix, CMAKE_DOC_DIR "/html"); -- } - } - if (cmSystemToolsCMakeRoot.empty() || - !cmSystemTools::FileExists( diff --git a/srcpkgs/cmake-bootstrap/template b/srcpkgs/cmake-bootstrap/template deleted file mode 100644 index b1468b0d55b2..000000000000 --- a/srcpkgs/cmake-bootstrap/template +++ /dev/null @@ -1,58 +0,0 @@ -# Template file for 'cmake-bootstrap' -pkgname=cmake-bootstrap -version=3.20.2 -revision=1 -wrksrc=cmake-$version -bootstrap=yes -build_style=configure -configure_args="--prefix=/usr --datadir=share/$pkgname --bindir=bin - --system-libs --no-system-curl --no-system-jsoncpp --no-system-nghttp2 - --no-system-librhash --no-system-libuv --no-system-expat --no-qt-gui - ${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}" -make_build_args="-C Bootstrap.cmk DOCDIR=/usr/share/doc" -makedepends="libarchive-devel" -short_desc="CMake (for bootstrapping only, not for normal usage)" -maintainer="Đoàn Trần Công Danh " -license="LGPL-2.1-or-later, BSD-3-Clause" -homepage="https://www.cmake.org" -distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz" -checksum=aecf6ecb975179eb3bb6a4a50cae192d41e92b9372b02300f9e8f1d5f559544e -conflicts="cmake>=0" - -CFLAGS="-DCMAKE_USE_SYSTEM_ZLIB -DCMAKE_USE_SYSTEM_LIBARCHIVE" -CXXFLAGS="$CFLAGS" - -post_patch() { - vsed -i -e '/exe_dir = CMAKE_BOOTSTRAP_BINARY_DIR/d' \ - -e '/ifndef CMAKE_BOOTSTRAP/{N;/Install tree/s/BOOTSTRAP/&_NO/}' \ - Source/cmSystemTools.cxx - vsed -i -e 's/[ ]RES=/ return /' \ - -e '/define CMAKE_BIN_DIR/s,/[a-z-]*,bin,' \ - -e "/define CMAKE_DATA_DIR/s,/[a-z-]*,share/$pkgname," \ - -e '/Run make to build bootstrap cmake/,$d' \ - bootstrap - rm -rf Utilities/cmbzip2 - rm -rf Utilities/cmcurl - rm -rf Utilities/cmexpat - rm -rf Utilities/cmlibarchive - rm -rf Utilities/cmliblzma - rm -rf Utilities/cmnghttp2 - rm -rf Utilities/cmzlib - rm -rf Utilities/cmzstd -} - -do_check() { - : "this is half baked cmake" -} - -do_install() { - vbin Bootstrap.cmk/cmake - vmkdir usr/share/$pkgname - vcopy Modules usr/share/$pkgname - vcopy Templates usr/share/$pkgname - - vlicense Copyright.txt - vlicense Utilities/KWIML/Copyright.txt KWIML-Copyright.txt - vlicense Utilities/cmlibuv/LICENSE libuv-LICENSE - vlicense Utilities/cmjsoncpp/LICENSE jsoncpp-LICENSE -} diff --git a/srcpkgs/cmake-bootstrap/update b/srcpkgs/cmake-bootstrap/update deleted file mode 120000 index c7f49c6a2d18..000000000000 --- a/srcpkgs/cmake-bootstrap/update +++ /dev/null @@ -1 +0,0 @@ -../cmake/update \ No newline at end of file From 2d6431168d77205ce2e3345751838d6a15bcbc1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 4 Jun 2021 16:09:22 +0700 Subject: [PATCH 6/7] cmake: update to 3.20.3. --- srcpkgs/cmake/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template index e1413c5a74cc..4d94f479b86b 100644 --- a/srcpkgs/cmake/template +++ b/srcpkgs/cmake/template @@ -2,6 +2,8 @@ pkgname=cmake version=3.20.2 revision=2 +version=3.20.3 +revision=1 build_style=configure configure_args="--prefix=/usr --mandir=/share/man --docdir=/share/doc/cmake --system-libs ${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}" @@ -15,7 +17,7 @@ maintainer="Đoàn Trần Công Danh " license="BSD-3-Clause, ICU" homepage="https://www.cmake.org" distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz" -checksum=aecf6ecb975179eb3bb6a4a50cae192d41e92b9372b02300f9e8f1d5f559544e +checksum=4d008ac3461e271fcfac26a05936f77fc7ab64402156fb371d41284851a651b8 replaces="cmake-bootstrap>=0" if [ "$CROSS_BUILD" ]; then From 2303528ea7151b5dc22b9f43680aed2442f01331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 4 Jun 2021 20:05:15 +0700 Subject: [PATCH 7/7] cmake-gui: update to 3.20.3. --- srcpkgs/cmake-gui/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template index 3f7cb6da6026..a3c6dbf3cb02 100644 --- a/srcpkgs/cmake-gui/template +++ b/srcpkgs/cmake-gui/template @@ -1,6 +1,6 @@ # Template file for 'cmake-gui' pkgname=cmake-gui -version=3.20.2 +version=3.20.3 revision=1 wrksrc="cmake-${version}" build_style=cmake @@ -17,7 +17,7 @@ maintainer="Đoàn Trần Công Danh " license="BSD-3-Clause" homepage="https://www.cmake.org" distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz" -checksum=aecf6ecb975179eb3bb6a4a50cae192d41e92b9372b02300f9e8f1d5f559544e +checksum=4d008ac3461e271fcfac26a05936f77fc7ab64402156fb371d41284851a651b8 # XXX: cmake is broken if cmake was built with -GNinja # https://bugs.gentoo.org/596460