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

xbps-src: ignore PREFER_BINPKG_DEPS for bootstrap pkgs.

Browse source
This commit is contained in:
Juan RP 2011-06-28 23:27:41 +02:00
parent 278a005d2e
commit f9b1494648
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -84,7 +84,7 @@ install_pkg_deps()
fi fi
done done
if [ -n "$XBPS_PREFER_BINPKG_DEPS" ]; then if [ -n "$XBPS_PREFER_BINPKG_DEPS" -a -z "$base_chroot" ]; then
install_pkg_with_binpkg ${curpkg} install_pkg_with_binpkg ${curpkg}
if [ $? -eq 255 ]; then if [ $? -eq 255 ]; then
# xbps-bin returned unexpected error # xbps-bin returned unexpected error
@ -148,7 +148,7 @@ 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" -a -z "$base_chroot" ]; then
msg_normal "'$pkgname-${lver}': installing dependencies from binpkgs...\n" msg_normal "'$pkgname-${lver}': installing dependencies from binpkgs...\n"
for i in ${notinstalled_deps}; do for i in ${notinstalled_deps}; do
install_pkg_with_binpkg ${i} install_pkg_with_binpkg ${i}
@ -173,7 +173,7 @@ install_dependencies_pkg()
check_build_depends_pkg check_build_depends_pkg
if [ $? -eq 1 ]; then if [ $? -eq 1 ]; then
msg_normal "Installing '$lpkgname' dependency: '$pkgn'.\n" msg_normal "Installing '$lpkgname' dependency: '$pkgn'.\n"
if [ -n "$XBPS_PREFER_BINPKG_DEPS" ]; then if [ -n "$XBPS_PREFER_BINPKG_DEPS" -a -z "$base_chroot" ]; then
install_pkg_with_binpkg ${j} install_pkg_with_binpkg ${j}
rval=$? rval=$?
if [ $rval -eq 255 ]; then if [ $rval -eq 255 ]; then