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

hooks/prepare-32bit: reset vars just in case.

Browse source
This commit is contained in:
Juan RP 2014-05-28 14:08:20 +02:00
parent 94ff665430
commit 7824268597
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/hooks/post-install/06-prepare-32bit.sh
View file

@ -87,7 +87,7 @@ hook() {
_deps="$(cat ${PKGDESTDIR}/rdeps)" _deps="$(cat ${PKGDESTDIR}/rdeps)"
fi fi
for f in ${_deps}; do for f in ${_deps}; do
unset pkgn pkgv _noarch _hasdevel unset pkgn pkgv _arch _shprovides
pkgn="$($XBPS_UHELPER_CMD getpkgdepname $f)" pkgn="$($XBPS_UHELPER_CMD getpkgdepname $f)"
if [ -z "${pkgn}" ]; then if [ -z "${pkgn}" ]; then
@ -100,8 +100,8 @@ hook() {
pkgv="$($XBPS_UHELPER_CMD getpkgdepversion ${f})" pkgv="$($XBPS_UHELPER_CMD getpkgdepversion ${f})"
fi fi
# If dependency is noarch do not change it to 32bit. # If dependency is noarch do not change it to 32bit.
_noarch=$($XBPS_QUERY_CMD -R --property=architecture "$f") _arch=$($XBPS_QUERY_CMD -R --property=architecture "$f")
if [ "${_noarch}" = "noarch" ]; then if [ "${_arch}" = "noarch" ]; then
printf "${pkgn}${pkgv} " >> ${destdir32}/rdeps printf "${pkgn}${pkgv} " >> ${destdir32}/rdeps
continue continue
fi fi