snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 5 Actions Activity

build-style/cmake: support build with cmake-bootstrap

This commit is contained in:
Đoàn Trần Công Danh 2023-06-22 23:11:58 +07:00 committed by Đoàn Trần Công Danh
parent d8a1929628
commit 6b9c9c7dfa
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/build-style/cmake.sh
View File

@ -72,6 +72,7 @@ _EOF
cmake_args+=" -DCMAKE_INSTALL_SBINDIR=bin" cmake_args+=" -DCMAKE_INSTALL_SBINDIR=bin"
export CMAKE_GENERATOR="${CMAKE_GENERATOR:-Ninja}" export CMAKE_GENERATOR="${CMAKE_GENERATOR:-Ninja}"
PATH="$PATH:/usr/libexec/xbps-src/bin"
# Remove -pipe: https://gitlab.kitware.com/cmake/cmake/issues/19590 # Remove -pipe: https://gitlab.kitware.com/cmake/cmake/issues/19590
CFLAGS="-DNDEBUG ${CFLAGS/ -pipe / }" CXXFLAGS="-DNDEBUG ${CXXFLAGS/ -pipe / }" \ CFLAGS="-DNDEBUG ${CFLAGS/ -pipe / }" CXXFLAGS="-DNDEBUG ${CXXFLAGS/ -pipe / }" \
cmake ${cmake_args} ${configure_args} \ cmake ${cmake_args} ${configure_args} \

4
common/environment/build-style/cmake.sh
View File

@ -1,6 +1,6 @@
if [ "$CHROOT_READY" ]; then if [ "$CHROOT_READY" ]; then
if [ "$pkgname" != cmake ]; then if [ "$pkgname" != cmake-bootstrap ]; then
hostmakedepends+=" cmake" hostmakedepends+=" cmake-bootstrap"
fi fi
if [ "${make_cmd:-ninja}" = ninja ]; then if [ "${make_cmd:-ninja}" = ninja ]; then
hostmakedepends+=" ninja" hostmakedepends+=" ninja"