From 1a4fb60dbb75747921effb89aa4c7cc7a64cb23a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sat, 23 Sep 2023 15:56:21 -0300 Subject: [PATCH] common/xbps-src/shutils/build_dependencies.sh: do not install checkdepends when check is not going to run --- common/xbps-src/shutils/build_dependencies.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/common/xbps-src/shutils/build_dependencies.sh b/common/xbps-src/shutils/build_dependencies.sh index 20f61528d14c27..a49b485a976315 100644 --- a/common/xbps-src/shutils/build_dependencies.sh +++ b/common/xbps-src/shutils/build_dependencies.sh @@ -137,7 +137,11 @@ install_pkg_deps() { local -a host_missing_deps missing_deps missing_rdeps [ -z "$pkgname" ] && return 2 - [ -z "$XBPS_CHECK_PKGS" ] && unset checkdepends + [ -z "$XBPS_CHECK_PKGS" ] || + [ "$XBPS_CROSS_BUILD" ] || + [ "$make_check" = ci-skip -a "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ] || + [ "$make_check" = extended -a "$XBPS_CHECK_PKGS" != full ] || + [ "$make_check" = no ] && unset checkdepends if [[ $build_style ]] || [[ $build_helper ]]; then style=" with" @@ -208,7 +212,7 @@ install_pkg_deps() { # # Host check dependencies. # - if [[ ${checkdepends} ]] && [[ $XBPS_CHECK_PKGS ]] && [ -z "$XBPS_CROSS_BUILD" ]; then + if [[ ${checkdepends} ]]; then templates="" # check validity for f in ${checkdepends}; do