From a653676c887ae976043a76f1cfc1594dcd7cf59c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 22 Jun 2021 22:41:53 +0700 Subject: [PATCH] build-style/cmake: only depends on cmake for non-cmake package * In the next change, we will remove it from cmake template entirely --- common/environment/build-style/cmake.sh | 4 +++- srcpkgs/cmake/template | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/common/environment/build-style/cmake.sh b/common/environment/build-style/cmake.sh index c2c0c76c8e..19b8f35a01 100644 --- a/common/environment/build-style/cmake.sh +++ b/common/environment/build-style/cmake.sh @@ -1,5 +1,7 @@ if [ "$CHROOT_READY" ]; then - hostmakedepends+=" cmake" + if [ "$pkgname" != cmake ]; then + hostmakedepends+=" cmake" + fi if [ "${make_cmd:-ninja}" = ninja ]; then hostmakedepends+=" ninja" fi diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template index 5d3308f93b..9da71ccd1a 100644 --- a/srcpkgs/cmake/template +++ b/srcpkgs/cmake/template @@ -20,6 +20,7 @@ replaces="cmake-bootstrap>=0" if [ "$CROSS_BUILD" ]; then build_style=cmake + hostmakedepends+=" cmake" configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DKWSYS_LFS_WORKS=1" fi