bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check architecture specific fields for VCS support

Browse source 
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2014-12-22 10:34:53 +10:00
parent a7c1b7a914
commit ec679e09b2
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scripts/makepkg.sh.in
View file

@ -2896,7 +2896,7 @@ get_vcsclient() {
} }
check_vcs_software() { check_vcs_software() {
local ret=0 local all_sources all_deps deps ret=0
if (( SOURCEONLY == 1 )); then if (( SOURCEONLY == 1 )); then
# we will not download VCS sources # we will not download VCS sources
@ -2908,7 +2908,17 @@ check_vcs_software() {
return $ret return $ret
fi fi
for netfile in ${source[@]}; do # we currently only use global depends/makedepends arrays for --syncdeps
for attr in depends makedepends; do
pkgbuild_get_attribute "$pkg" "$attr" 1 'deps'
all_deps+=("${deps[@]}")
pkgbuild_get_attribute "$pkg" "${attr}_$CARCH" 1 'deps'
all_deps+=("${deps[@]}")
done
get_all_sources_for_arch 'all_sources'
for netfile in ${all_sources[@]}; do
local proto=$(get_protocol "$netfile") local proto=$(get_protocol "$netfile")
case $proto in case $proto in
@ -2921,7 +2931,7 @@ check_vcs_software() {
uninstalled="$(set +E; check_deps $client)" || exit 1 uninstalled="$(set +E; check_deps $client)" || exit 1
# if not installed, check presence in depends or makedepends # if not installed, check presence in depends or makedepends
if [[ -n "$uninstalled" ]] && (( ! NODEPS || ( VERIFYSOURCE && !DEP_BIN ) )); then 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.")" \ error "$(gettext "Cannot find the %s package needed to handle %s sources.")" \
"$client" "${proto%%+*}" "$client" "${proto%%+*}"
ret=1 ret=1