parent
bebf257aa2
commit
04715e12f6
2 changed files with 5 additions and 4 deletions
|
@ -62,6 +62,7 @@ _EOF
|
||||||
|
|
||||||
cmake_args+=" -DCMAKE_INSTALL_SBINDIR=bin"
|
cmake_args+=" -DCMAKE_INSTALL_SBINDIR=bin"
|
||||||
|
|
||||||
|
export CMAKE_GENERATOR="${CMAKE_GENERATOR:-Ninja}"
|
||||||
# Override flags: https://gitlab.kitware.com/cmake/cmake/issues/19590
|
# Override flags: https://gitlab.kitware.com/cmake/cmake/issues/19590
|
||||||
CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
|
CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
|
||||||
cmake ${cmake_args} ${configure_args} $(echo ${cmake_builddir}|sed \
|
cmake ${cmake_args} ${configure_args} $(echo ${cmake_builddir}|sed \
|
||||||
|
@ -72,7 +73,7 @@ _EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
do_build() {
|
do_build() {
|
||||||
: ${make_cmd:=make}
|
: ${make_cmd:=ninja}
|
||||||
|
|
||||||
cd ${cmake_builddir:=build}
|
cd ${cmake_builddir:=build}
|
||||||
${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
|
${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
|
||||||
|
@ -92,14 +93,14 @@ do_check() {
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
: ${make_cmd:=make}
|
: ${make_cmd:=ninja}
|
||||||
: ${make_check_target:=test}
|
: ${make_check_target:=test}
|
||||||
|
|
||||||
CTEST_OUTPUT_ON_FAILURE=TRUE ${make_cmd} ${make_check_args} ${make_check_target}
|
CTEST_OUTPUT_ON_FAILURE=TRUE ${make_cmd} ${make_check_args} ${make_check_target}
|
||||||
}
|
}
|
||||||
|
|
||||||
do_install() {
|
do_install() {
|
||||||
: ${make_cmd:=make}
|
: ${make_cmd:=ninja}
|
||||||
: ${make_install_target:=install}
|
: ${make_install_target:=install}
|
||||||
|
|
||||||
cd ${cmake_builddir:=build}
|
cd ${cmake_builddir:=build}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
if [ "$CHROOT_READY" ]; then
|
if [ "$CHROOT_READY" ]; then
|
||||||
if [[ "$hostmakedepends" != *"cmake-bootstrap"* ]]; then
|
if [[ "$hostmakedepends" != *"cmake-bootstrap"* ]]; then
|
||||||
hostmakedepends+=" cmake"
|
hostmakedepends+=" cmake ninja"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue