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

common: move handling of rdeps, shlib-provides, shlib-requires files

Browse source 
to XBPS_STATEDIR. There's no need for them to pollute PKGDESTDIR. Keep
INSTALL.msg/REMOVE.msg handling as-is for now because it's a little more
complex. Keep the pkglints for these files because xbps still ignores
them.
This commit is contained in:
classabbyamp 2024-12-07 12:27:22 -05:00 • committed by classabbyamp
parent b9acde8b15
commit 17efb6163a
8 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

22
common/hooks/pre-pkg/05-generate-32bit-runtime-deps.sh
View file

@ -19,13 +19,13 @@ hook() {
# 32bit dependencies.
trap - ERR
: > ${destdir32}/rdeps
: > ${XBPS_STATEDIR}/${pkgname}-32bit-rdeps
if [ -s "$PKGDESTDIR/rdeps" ]; then
if [ -s "${XBPS_STATEDIR}/${pkgname}-rdeps" ]; then
if [ -n "$lib32depends" ]; then
_deps="${lib32depends}"
else
_deps="$(<${PKGDESTDIR}/rdeps)"
_deps="$(<${XBPS_STATEDIR}/${pkgname}-rdeps)"
fi
for f in ${_deps}; do
unset found pkgn pkgv _shprovides
@ -43,7 +43,7 @@ hook() {
# If dependency is a development pkg switch it to 32bit.
if [[ $pkgn == *-devel ]]; then
echo " RDEP: $f -> ${pkgn}-32bit${pkgv} (development)"
printf "${pkgn}-32bit${pkgv} " >> ${destdir32}/rdeps
printf "${pkgn}-32bit${pkgv} " >> ${XBPS_STATEDIR}/${pkgname}-32bit-rdeps
continue
fi
# If dependency does not have "shlib-provides" do not
@ -60,20 +60,20 @@ hook() {
_shprovides="$($XBPS_QUERY_CMD -R --property=shlib-provides "$pkgn")"
if [ -n "${_shprovides}" ]; then
echo " RDEP: $f -> ${pkgn}-32bit${pkgv} (shlib-provides)"
printf "${pkgn}-32bit${pkgv} " >> ${destdir32}/rdeps
printf "${pkgn}-32bit${pkgv} " >> ${XBPS_STATEDIR}/${pkgname}-32bit-rdeps
else
echo " RDEP: $f -> ${pkgn}${pkgv} (no shlib-provides)"
printf "${pkgn}${pkgv} " >> ${destdir32}/rdeps
printf "${pkgn}${pkgv} " >> ${XBPS_STATEDIR}/${pkgname}-32bit-rdeps
fi
else
if [ -s ${XBPS_DESTDIR}/${pkgn}-${version}/shlib-provides ]; then
if [ -s "${XBPS_STATEDIR}/${pkgn}-shlib-provides" ]; then
# Dependency is a subpkg; check if it provides any shlib
# and convert to 32bit if true.
echo " RDEP: $f -> ${pkgn}-32bit${pkgv} (subpkg, shlib-provides)"
printf "${pkgn}-32bit${pkgv} " >> ${destdir32}/rdeps
printf "${pkgn}-32bit${pkgv} " >> ${XBPS_STATEDIR}/${pkgname}-32bit-rdeps
else
echo " RDEP: $f -> ${pkgn}${pkgv} (subpkg, no shlib-provides)"
printf "${pkgn}${pkgv} " >> ${destdir32}/rdeps
printf "${pkgn}${pkgv} " >> ${XBPS_STATEDIR}/${pkgname}-32bit-rdeps
fi
fi
done
@ -81,7 +81,7 @@ hook() {
# If it's a development pkg add a dependency to the 64bit pkg.
if [[ $pkgn == *-devel ]]; then
echo " RDEP: ${pkgver}"
printf "${pkgver} " >> ${destdir32}/rdeps
printf "${pkgver} " >> ${XBPS_STATEDIR}/${pkgname}-32bit-rdeps
fi
printf "\n" >> ${destdir32}/rdeps
printf "\n" >> ${XBPS_STATEDIR}/${pkgname}-32bit-rdeps
}