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

hooks/gen-pkg: keep provides for 32bit conversion before creating -dbg subpkgs.

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

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

@ -135,6 +135,12 @@ hook() {
genpkg ${repo} ${arch} "${short_desc}" ${pkgver} ${binpkg} genpkg ${repo} ${arch} "${short_desc}" ${pkgver} ${binpkg}
for f in ${provides}; do
_pkgn="$($XBPS_UHELPER_CMD getpkgname $f)"
_pkgv="$($XBPS_UHELPER_CMD getpkgversion $f)"
_provides+=" ${_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
source ${XBPS_COMMONDIR}/environment/setup-subpkg/subpkg.sh source ${XBPS_COMMONDIR}/environment/setup-subpkg/subpkg.sh
@ -150,11 +156,6 @@ hook() {
return return
fi fi
if [ -d "${XBPS_DESTDIR}/${pkgname}-32bit-${version}" ]; then if [ -d "${XBPS_DESTDIR}/${pkgname}-32bit-${version}" ]; then
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