hooks/gen-pkg: keep and transform "replaces" in 32bit pkgs.

This commit is contained in:
Juan RP 2014-08-22 09:21:04 +02:00
parent 746b23240d
commit d27e135986

View file

@ -140,6 +140,11 @@ hook() {
_pkgv="$($XBPS_UHELPER_CMD getpkgversion $f)" _pkgv="$($XBPS_UHELPER_CMD getpkgversion $f)"
_provides+=" ${_pkgn}-32bit-${_pkgv}" _provides+=" ${_pkgn}-32bit-${_pkgv}"
done done
for f in ${replaces}; do
_pkgn="$($XBPS_UHELPER_CMD getpkgdepname $f)"
_pkgv="$($XBPS_UHELPER_CMD getpkgdepversion $f)"
_replaces+=" ${_pkgn}-32bit${_pkgv}"
done
# Generate -dbg pkg. # Generate -dbg pkg.
if [ -d "${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-dbg-${version}" ]; then if [ -d "${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-dbg-${version}" ]; then
@ -167,6 +172,7 @@ hook() {
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}" [ -n "${_provides}" ] && export provides="${_provides}"
[ -n "${_replaces}" ] && export replaces="${_replaces}"
genpkg ${repo} x86_64 "${_desc}" ${_pkgver} ${binpkg} genpkg ${repo} x86_64 "${_desc}" ${_pkgver} ${binpkg}
fi fi
} }