Signed-off-by: Allan McRae
---
scripts/makepkg.sh.in | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 23e70cd..f5373bf 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -2897,6 +2897,7 @@ get_vcsclient() {
check_vcs_software() {
local ret=0
+ local alldeps l
if (( SOURCEONLY == 1 )); then
# we will not download VCS sources
@@ -2908,6 +2909,20 @@ check_vcs_software() {
return $ret
fi
+
+ if array_build l 'depends'; then
+ alldeps+=("${l[@]}")
+ fi
+ if array_build l 'makedepends'; then
+ alldeps+=("${l[@]}")
+ fi
+ if array_build l "depends_$CARCH"; then
+ alldeps+=("${l[@]}")
+ fi
+ if array_build l "makedepends_$CARCH"; then
+ alldeps+=("${l[@]}")
+ fi
+
for netfile in ${source[@]}; do
local proto=$(get_protocol "$netfile")
@@ -2921,7 +2936,7 @@ check_vcs_software() {
uninstalled="$(set +E; check_deps $client)" || exit 1
# if not installed, check presence in depends or makedepends
if [[ -n "$uninstalled" ]] && (( ! NODEPS || ( VERIFYSOURCE && !DEP_BIN ) )); then
- if ! in_array "$client" ${depends[@]} ${makedepends[@]}; then
+ if ! in_array "$client" ${alldeps[@]}; then
error "$(gettext "Cannot find the %s package needed to handle %s sources.")" \
"$client" "${proto%%+*}"
ret=1
--
2.2.0