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

common/hooks: fix pkg generation for 32bit and dbg pkgs

Browse source 
17efb6163a had a couple mistakes that were causing issues with the
generated dependencies for -32bit and -dbg packages because they are
~extra special~
This commit is contained in:
classabbyamp 2024-12-12 22:08:47 -05:00
parent 49402e9d2b
commit 46306a0f73
No known key found for this signature in database
GPG key ID: 6BE0755918A4C7F5
2 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
common/hooks/post-install/98-shlib-provides.sh
View file

@ -6,7 +6,8 @@ collect_sonames() {
local _pattern="^[[:alnum:]]+(.*)+\.so(\.[0-9]+)*$"
local _versioned_pattern="^[[:alnum:]]+(.*)+\.so(\.[0-9]+)+$"
local _tmpfile=$(mktemp) || exit 1
local _mainpkg="$2"
local _mainpkg="${2:-}"
local _suffix="${3:-}"
local _shlib_dir="${XBPS_STATEDIR}/shlib-provides"
local _no_soname=$(mktemp) || exit 1
@ -50,8 +51,8 @@ collect_sonames() {
echo "$f" >> ${_tmpfile}
done
if [ -s "${_tmpfile}" ]; then
tr '\n' ' ' < "${_tmpfile}" > "${XBPS_STATEDIR}/${pkgname}-shlib-provides"
echo >> "${XBPS_STATEDIR}/${pkgname}-shlib-provides"
tr '\n' ' ' < "${_tmpfile}" > "${XBPS_STATEDIR}/${pkgname}${_suffix}-shlib-provides"
echo >> "${XBPS_STATEDIR}/${pkgname}${_suffix}-shlib-provides"
if [ "$_mainpkg" ]; then
cp "${_tmpfile}" "${_shlib_dir}/${pkgname}.soname"
fi
@ -84,5 +85,5 @@ hook() {
# native pkg
collect_sonames ${PKGDESTDIR} $_mainpkg
# 32bit pkg
collect_sonames ${_destdir32}
collect_sonames ${_destdir32} "" -32bit
}