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

xbps-src: install_dependencies_pkg(): use install_pkg_with_binpkg().

Browse source
This commit is contained in:
Juan RP 2011-06-22 12:32:16 +02:00
parent 47e5390ea6
commit bcbfb0c63c
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -117,7 +117,7 @@ install_pkg_deps()
# #
install_dependencies_pkg() install_dependencies_pkg()
{ {
local pkg="$1" rval pkgdep_list local pkg="$1" rval
local lpkgname=$(${XBPS_PKGDB_CMD} getpkgname ${pkg}) local lpkgname=$(${XBPS_PKGDB_CMD} getpkgname ${pkg})
local i j pkgn iver reqver notinstalled_deps lver local i j pkgn iver reqver notinstalled_deps lver
@ -149,16 +149,14 @@ install_dependencies_pkg()
[ -z "$notinstalled_deps" ] && return 0 [ -z "$notinstalled_deps" ] && return 0
if [ -n "$XBPS_PREFER_BINPKG_DEPS" ]; then if [ -n "$XBPS_PREFER_BINPKG_DEPS" ]; then
msg_normal "'$pkgname-${lver}': installing dependencies from binpkgs...\n"
for i in ${notinstalled_deps}; do for i in ${notinstalled_deps}; do
pkgdeplist="${pkgdeplist} \"${i}\" " install_pkg_with_binpkg "${i}"
done done
msg_normal "$pkgname-$lver: installing build dependencies from binpkgs...\n"
${fakeroot_cmd} ${fakeroot_cmd_args} ${XBPS_BIN_CMD} \
-Ay install ${pkgdeplist}
rval=$? rval=$?
if [ $rval -eq 255 ]; then if [ $rval -eq 255 ]; then
# xbps-bin returned unexpected error (-1) # xbps-bin returned unexpected error (-1)
msg_error "${pkgname}-${lver}: failed to install required binpkgdeps!\n" msg_error "'${pkgname}-${lver}': failed to install required binpkgdeps!\n"
elif [ $rval -eq 0 ]; then elif [ $rval -eq 0 ]; then
# Install successfully # Install successfully
echo echo