From 6b9c9c7dfacc2c892099ff117af5ce693a65442a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 22 Jun 2023 23:11:58 +0700
Subject: [PATCH] build-style/cmake: support build with cmake-bootstrap

---
 common/build-style/cmake.sh             | 1 +
 common/environment/build-style/cmake.sh | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 43750ad20dc..6b71ea66a22 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -72,6 +72,7 @@ _EOF
 	cmake_args+=" -DCMAKE_INSTALL_SBINDIR=bin"
 
 	export CMAKE_GENERATOR="${CMAKE_GENERATOR:-Ninja}"
+	PATH="$PATH:/usr/libexec/xbps-src/bin"
 	# Remove -pipe: https://gitlab.kitware.com/cmake/cmake/issues/19590
 	CFLAGS="-DNDEBUG ${CFLAGS/ -pipe / }" CXXFLAGS="-DNDEBUG ${CXXFLAGS/ -pipe / }" \
 		cmake ${cmake_args} ${configure_args} \
diff --git a/common/environment/build-style/cmake.sh b/common/environment/build-style/cmake.sh
index 19b8f35a01d..d3011338436 100644
--- a/common/environment/build-style/cmake.sh
+++ b/common/environment/build-style/cmake.sh
@@ -1,6 +1,6 @@
 if [ "$CHROOT_READY" ]; then
-	if [ "$pkgname" != cmake ]; then
-		hostmakedepends+=" cmake"
+	if [ "$pkgname" != cmake-bootstrap ]; then
+		hostmakedepends+=" cmake-bootstrap"
 	fi
 	if [ "${make_cmd:-ninja}" = ninja ]; then
 		hostmakedepends+=" ninja"