moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

xbps-src: install_pkg_deps: another performance change.

Browse source
This commit is contained in:
Juan RP 2011-10-28 11:22:30 +02:00
parent a8bd4ed7ad
commit aa67f4ffdb
1 changed files with 13 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

31
xbps-src/shutils/builddep_funcs.sh
View file

@ -139,12 +139,6 @@ install_pkg_deps()
fi fi
for j in ${build_depends}; do for j in ${build_depends}; do
#
# Check if dep is satisfied.
#
check_pkgdep_matched "${j}"
[ $? -eq 0 ] && continue
prev_pkg="$j" prev_pkg="$j"
if [ -n "$XBPS_PREFER_BINPKG_DEPS" -a -z "$bootstrap" ]; then if [ -n "$XBPS_PREFER_BINPKG_DEPS" -a -z "$bootstrap" ]; then
install_pkg_from_repos \"${j}\" install_pkg_from_repos \"${j}\"
@ -156,19 +150,20 @@ install_pkg_deps()
: :
continue continue
fi fi
fi else
# #
# Iterate again, this will check if there are more # Iterate again, this will check if there are more
# required deps for current pkg. # required deps for current pkg.
# #
install_pkg_deps "${j}" "${curpkg}" install_pkg_deps "${j}" "${curpkg}"
if [ $? -eq 1 ]; then if [ $? -eq 1 ]; then
if [ -n "$saved_prevpkg" ]; then if [ -n "$saved_prevpkg" ]; then
msg_red "$saved_prevpkg: failed to install dependency '$curpkg'\n" msg_red "$saved_prevpkg: failed to install dependency '$curpkg'\n"
else else
msg_red "${_ORIGINPKG}: failed to install dependency '$curpkg'\n" msg_red "${_ORIGINPKG}: failed to install dependency '$curpkg'\n"
fi
return 1
fi fi
return 1
fi fi
done done