tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

xbps-src: improve how deps are passed in to xbps-bin(8).

Browse Source
This commit is contained in:
Juan RP 2011-10-09 14:07:57 +02:00
parent 9724434a58
commit 6623f95f7a
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
xbps-src/shutils/builddep_funcs.sh
View File

@ -37,8 +37,15 @@ install_pkglist_from_repos()
msg_normal "$pkgver: installing required dependencies ...\n" msg_normal "$pkgver: installing required dependencies ...\n"
[ -z "${wrksrc}" ] && wrksrc="$XBPS_BUILDDIR/$pkgname" [ -z "${wrksrc}" ] && wrksrc="$XBPS_BUILDDIR/$pkgname"
[ ! -d "${wrksrc}" ] && mkdir -p "${wrksrc}" [ ! -d "${wrksrc}" ] && mkdir -p "${wrksrc}"
${cmd} ${1} >${wrksrc}/.xbps_install_dependencies.log 2>&1
depstmpf=$(mktemp)
for f in ${1}; do
echo "'${f}' " >> $depstmpf
done
${cmd} $(cat $depstmpf) >${wrksrc}/.xbps_install_dependencies.log 2>&1
rval=$? rval=$?
rm -f $depstmpf
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:
# #
@ -241,7 +248,7 @@ install_dependencies_pkg()
{ {
local pkg="$1" rval 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 local i j pkgn iver reqver notinstalled_deps pkglist
[ -z "$pkg" ] && return 2 [ -z "$pkg" ] && return 2
[ -z "$build_depends" ] && return 0 [ -z "$build_depends" ] && return 0
@ -268,18 +275,10 @@ install_dependencies_pkg()
if [ -n "$XBPS_PREFER_BINPKG_DEPS" -a -z "$bootstrap" ]; then if [ -n "$XBPS_PREFER_BINPKG_DEPS" -a -z "$bootstrap" ]; then
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 [ "${notinstalled_deps}" = "${build_depends}" ]; then if [ -z "$pkglist" ]; then
if [ -z "$pkglist" ]; then pkglist="${i}"
pkglist="\"${i}\""
else
pkglist="${pkglist} \"${i}\""
fi
else else
if [ -z "$pkglist" ]; then pkglist="${pkglist} ${i}"
pkglist="${i}"
else
pkglist="${pkglist} ${i}"
fi
fi fi
done done
install_pkglist_from_repos "${pkglist}" install_pkglist_from_repos "${pkglist}"