hooks/gen-pkg: convert provides for 32bit pkgs.
This commit is contained in:
parent
a29e0f1f9d
commit
00040a63fa
|
@ -150,6 +150,12 @@ 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
|
||||||
|
pkgn="$($XBPS_UHELPER_CMD getpkgname $f)"
|
||||||
|
pkgv="$($XBPS_UHELPER_CMD getpkgversion $f)"
|
||||||
|
_provides+=" ${pkgn}-32bit-${pkgv}"
|
||||||
|
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
|
||||||
repo=$XBPS_REPOSITORY/multilib/nonfree
|
repo=$XBPS_REPOSITORY/multilib/nonfree
|
||||||
|
@ -160,6 +166,7 @@ hook() {
|
||||||
_desc="${short_desc} (32bit)"
|
_desc="${short_desc} (32bit)"
|
||||||
binpkg=${_pkgver}.x86_64.xbps
|
binpkg=${_pkgver}.x86_64.xbps
|
||||||
PKGDESTDIR="${XBPS_DESTDIR}/${pkgname}-32bit-${version}"
|
PKGDESTDIR="${XBPS_DESTDIR}/${pkgname}-32bit-${version}"
|
||||||
|
[ -n "${_provides}" ] && export provides="${_provides}"
|
||||||
genpkg ${repo} x86_64 "${_desc}" ${_pkgver} ${binpkg}
|
genpkg ${repo} x86_64 "${_desc}" ${_pkgver} ${binpkg}
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue