jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

xbps-src: some more improvements for binpkg deps.

Browse source
This commit is contained in:
Juan RP 2011-10-04 22:01:12 +02:00
parent 1cfef1fd5f
commit 8d300ed38d
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -47,10 +47,11 @@ install_pkglist_from_repos()
# EEXIST (6): package already installed. # EEXIST (6): package already installed.
# ENODEV (19): package depends on missing dependencies. # ENODEV (19): package depends on missing dependencies.
# #
# Any other returned is criticial. # Any other error returned is critical.
autoremove_pkg_dependencies $KEEP_AUTODEPS autoremove_pkg_dependencies $KEEP_AUTODEPS
msg_red "$pkgver: failed to install required dependencies! (error $rval)\n" msg_red "$pkgver: failed to install required dependencies! (error $rval)\n"
msg_error "$pkgver': please take a look the logs in \$wrksrc.\n" cat ${wrksrc}/.xbps_install_dependencies.log
msg_error "Please see above for the real error, exiting...\n"
fi fi
return $rval return $rval
@ -59,7 +60,7 @@ install_pkglist_from_repos()
# #
# Install a required package dependency, like: # Install a required package dependency, like:
# #
# xbps-bin instlal "foo>=0" # xbps-bin install "foo>=0"
# #
install_pkg_from_repos() install_pkg_from_repos()
{ {
@ -71,7 +72,7 @@ install_pkg_from_repos()
msg_normal "$pkgver: installing required dependency '$pkg' ...\n" msg_normal "$pkgver: installing required dependency '$pkg' ...\n"
[ -z "${wrksrc}" ] && wrksrc="$XBPS_BUILDDIR/$pkgname" [ -z "${wrksrc}" ] && wrksrc="$XBPS_BUILDDIR/$pkgname"
[ ! -d "${wrksrc}" ] && mkdir -p "${wrksrc}" [ ! -d "${wrksrc}" ] && mkdir -p "${wrksrc}"
${cmd} "\"$pkg\"" >${wrksrc}/.xbps_install_dependency_${pkgdepname}.log 2>&1 ${cmd} "${pkg}" >${wrksrc}/.xbps_install_dependency_${pkgdepname}.log 2>&1
rval=$? rval=$?
if [ $rval -ne 0 -a $rval -ne 6 ]; then if [ $rval -ne 0 -a $rval -ne 6 ]; then
# xbps-bin can return: # xbps-bin can return:
@ -81,10 +82,11 @@ install_pkg_from_repos()
# EEXIST (6): package already installed. # EEXIST (6): package already installed.
# ENODEV (19): package depends on missing dependencies. # ENODEV (19): package depends on missing dependencies.
# #
# Any other returned is criticial. # Any other error returned is critical.
autoremove_pkg_dependencies $KEEP_AUTODEPS autoremove_pkg_dependencies $KEEP_AUTODEPS
msg_red "$pkgver: failed to install '${pkg}' dependency! (error $rval)\n" msg_red "$pkgver: failed to install '${pkg}' dependency! (error $rval)\n"
msg_error "Please see ${wrksrc}/.xbps_install_${pkgdepname}.log to see what went wrong!\n" cat ${wrksrc}/.xbps_install_${pkgdepname}.log
msg_error "Please see above for the real error, exiting...\n"
fi fi
return $rval return $rval
@ -179,7 +181,7 @@ install_pkg_deps()
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}"
if [ $? -eq 255 ]; then if [ $? -eq 255 ]; then
# xbps-bin returned unexpected error # xbps-bin returned unexpected error
msg_red "$saved_prevpkg: failed to install dependency '$j'\n" msg_red "$saved_prevpkg: failed to install dependency '$j'\n"
@ -205,7 +207,7 @@ install_pkg_deps()
done done
if [ -n "$XBPS_PREFER_BINPKG_DEPS" -a -z "$bootstrap" ]; then if [ -n "$XBPS_PREFER_BINPKG_DEPS" -a -z "$bootstrap" ]; then
install_pkg_from_repos ${curpkg} install_pkg_from_repos "${curpkg}"
if [ $? -eq 255 ]; then if [ $? -eq 255 ]; then
# xbps-bin returned unexpected error # xbps-bin returned unexpected error
return $? return $?
@ -267,7 +269,7 @@ install_dependencies_pkg()
msg_normal "$pkgver: installing dependencies from repositories ...\n" msg_normal "$pkgver: installing dependencies from repositories ...\n"
for i in ${notinstalled_deps}; do for i in ${notinstalled_deps}; do
if [ -z "$pkglist" ]; then if [ -z "$pkglist" ]; then
pkglist="${i}" pkglist="\"${i}\""
else else
pkglist="${pkglist} \"${i}\"" pkglist="${pkglist} \"${i}\""
fi fi