tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

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

4
common/hooks/pre-pkg/04-generate-runtime-deps.sh
View File

@@ -41,7 +41,7 @@ store_pkgdestdir_rundeps() {
_curdep="${_curdep}>=0"
fi
printf "%s " "${_curdep}"
done > "${PKGDESTDIR}/rdeps"
done > "${XBPS_STATEDIR}/${pkgname}-rdeps"
fi
}
@@ -149,6 +149,6 @@ hook() {
store_pkgdestdir_rundeps
if [ -n "${sorequires}" ]; then
echo "${sorequires}" | xargs -n1 | sort | xargs > ${PKGDESTDIR}/shlib-requires
echo "${sorequires}" | xargs -n1 | sort | xargs > ${XBPS_STATEDIR}/${pkgname}-shlib-requires
fi
}

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
}

4
common/hooks/pre-pkg/99-pkglint.sh
View File

@@ -170,11 +170,11 @@ hook() {
fi
# Check for missing shlibs and SONAME bumps.
if [ ! -s "${PKGDESTDIR}/shlib-provides" ]; then
if [ ! -s "${XBPS_STATEDIR}/${pkgname}-shlib-provides" ]; then
return 0
fi
for filename in $(<${PKGDESTDIR}/shlib-provides); do
for filename in $(<"${XBPS_STATEDIR}/${pkgname}-shlib-provides"); do
rev=${filename#*.so.}
libname=${filename%.so*}
_shlib=$(echo "$libname"|sed -E 's|\+|\\+|g')

4
common/hooks/pre-pkg/999-collected-rdeps.sh
View File

@@ -1,7 +1,7 @@
# This hook displays resolved dependencies for a pkg.
hook() {
if [ -e $PKGDESTDIR/rdeps ]; then
echo " $(cat $PKGDESTDIR/rdeps)"
if [ -e "${XBPS_STATEDIR}/${pkgname}-rdeps" ]; then
echo " $(cat "${XBPS_STATEDIR}/${pkgname}-rdeps")"
fi
}