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

hooks/gen-pkg: use local vars for 32bit provides conversion.

Browse source
This commit is contained in:
Juan RP 2014-07-23 15:19:16 +02:00
parent 8679164e4f
commit 49133f9b62
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
common/hooks/do-pkg/00-gen-pkg.sh
View file

@ -112,7 +112,7 @@ genpkg() {
} }
hook() { hook() {
local arch= binpkg= repo= _pkgver= _desc= local arch= binpkg= repo= _pkgver= _desc= _pkgn= _pkgv= _provides= _replaces=
if [ -n "$noarch" ]; then if [ -n "$noarch" ]; then
arch=noarch arch=noarch
@ -150,11 +150,10 @@ hook() {
return return
fi fi
if [ -d "${XBPS_DESTDIR}/${pkgname}-32bit-${version}" ]; then if [ -d "${XBPS_DESTDIR}/${pkgname}-32bit-${version}" ]; then
unset pkgn pkgv _provides _replaces
for f in ${provides}; do for f in ${provides}; do
pkgn="$($XBPS_UHELPER_CMD getpkgname $f)" _pkgn="$($XBPS_UHELPER_CMD getpkgname $f)"
pkgv="$($XBPS_UHELPER_CMD getpkgversion $f)" _pkgv="$($XBPS_UHELPER_CMD getpkgversion $f)"
_provides+=" ${pkgn}-32bit-${pkgv}" _provides+=" ${_pkgn}-32bit-${_pkgv}"
done done
source ${XBPS_COMMONDIR}/environment/setup-subpkg/subpkg.sh source ${XBPS_COMMONDIR}/environment/setup-subpkg/subpkg.sh
if [ -n "$nonfree" ]; then if [ -n "$nonfree" ]; then