jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

build-style/cmake: only depends on cmake for non-cmake package

Browse source 
* In the next change, we will remove it from cmake template entirely
This commit is contained in:
Đoàn Trần Công Danh 2021-06-22 22:41:53 +07:00 committed by Đoàn Trần Công Danh
parent 6027990b48
commit a653676c88
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

1
srcpkgs/cmake/template
View file

@ -20,6 +20,7 @@ replaces="cmake-bootstrap>=0"
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
build_style=cmake build_style=cmake
hostmakedepends+=" cmake"
configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
-DCMAKE_USE_SYSTEM_LIBRARIES=ON -DKWSYS_LFS_WORKS=1" -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DKWSYS_LFS_WORKS=1"
fi fi