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

xbps-src: if pkgver from repos not matched, build from src.

Browse source
This commit is contained in:
Juan RP 2011-11-10 14:33:59 +01:00
parent c3b49676fe
commit 7136110441
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,7 +30,7 @@
# #
install_pkg_from_repos() install_pkg_from_repos()
{ {
local cmd rval tmplogf tmpdepf local rval tmplogf tmpdepf
msg_normal "$pkgver: installing '$1'... " msg_normal "$pkgver: installing '$1'... "
@ -43,19 +43,22 @@ install_pkg_from_repos()
return 2 return 2
fi fi
_pkgver=$($XBPS_REPO_CMD} -oversion show ${_pkgdepname}) _pkgver=$($XBPS_REPO_CMD} -oversion show ${_pkgdepname})
_repoloc=$($XBPS_REPO_CMD} -orepository show ${_pkgdepname}) msg_normal_append "found ${_pkgver} "
msg_normal_append "found ${_pkgver} (${_repoloc})\n" $XBPS_PKGDB_CMD pkgmatch "${_pkgdepname}-${_pkgver}" "${1}"
if [ $? -eq 1 ]; then
_repoloc=$($XBPS_REPO_CMD} -orepository show ${_pkgdepname})
msg_normal_append "(${_repoloc})\n"
else
msg_normal_append "not matched, building from source...\n"
return 2
fi
;; ;;
*) msg_normal_append "\n";; *) msg_normal_append "\n";;
esac esac
cmd="${FAKEROOT_CMD} ${FAKEROOT_CMD_ARGS} ${XBPS_BIN_CMD} -Ay install"
tmplogf=$(mktemp) tmplogf=$(mktemp)
tmpdepf=$(mktemp) $FAKEROOT_CMD $FAKEROOT_CMD_ARGS $XBPS_BIN_CMD -Ay install ${_pkgdepname} >$tmplogf 2>&1
echo "'${1}'" > $tmpdepf
${cmd} $(cat $tmpdepf) >$tmplogf 2>&1
rval=$? rval=$?
rm -f $tmpdepf
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:
# #