hyro/void-packages
1
0
Fork 0
mirror of https://github.com/xHyroM/void-packages.git synced 2024-12-22 20:21:05 +01:00
Code Issues Projects Releases Wiki Activity

build: sync with upstream 2024-12-14 https://github.com/void-linux/void-packages/commit/b87a1d3a

Browse source
This commit is contained in:
github-actions[bot] 2024-12-14 01:07:51 +00:00
parent f78798a6c0
commit 91df805d2b
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
# This hook generates a XBPS binary package from an installed package in destdir. # This hook generates a XBPS binary package from an installed package in destdir.
genpkg() { genpkg() {
local pkgdir="$1" arch="$2" desc="$3" pkgver="$4" binpkg="$5" local pkgdir="$1" arch="$2" desc="$3" pkgver="$4" binpkg="$5" suffix="${6:-}"
local _preserve _deps _shprovides _shrequires _gitrevs _provides _conflicts local _preserve _deps _shprovides _shrequires _gitrevs _provides _conflicts
local _replaces _reverts _mutable_files _conf_files f local _replaces _reverts _mutable_files _conf_files f
local _pkglock="$pkgdir/${binpkg}.lock" local _pkglock="$pkgdir/${binpkg}.lock"
@ -34,14 +34,14 @@ genpkg() {
cd $pkgdir cd $pkgdir
_preserve=${preserve:+-p} _preserve=${preserve:+-p}
if [ -s ${XBPS_STATEDIR}/${pkgname}-rdeps ]; then if [ -s ${XBPS_STATEDIR}/${pkgname}${suffix}-rdeps ]; then
_deps="$(<${XBPS_STATEDIR}/${pkgname}-rdeps)" _deps="$(<${XBPS_STATEDIR}/${pkgname}${suffix}-rdeps)"
fi fi
if [ -s ${XBPS_STATEDIR}/${pkgname}-shlib-provides ]; then if [ -s ${XBPS_STATEDIR}/${pkgname}${suffix}-shlib-provides ]; then
_shprovides="$(<${XBPS_STATEDIR}/${pkgname}-shlib-provides)" _shprovides="$(<${XBPS_STATEDIR}/${pkgname}${suffix}-shlib-provides)"
fi fi
if [ -s ${XBPS_STATEDIR}/${pkgname}-shlib-requires ]; then if [ -s ${XBPS_STATEDIR}/${pkgname}${suffix}-shlib-requires ]; then
_shrequires="$(<${XBPS_STATEDIR}/${pkgname}-shlib-requires)" _shrequires="$(<${XBPS_STATEDIR}/${pkgname}${suffix}-shlib-requires)"
fi fi
if [ -s ${XBPS_STATEDIR}/gitrev ]; then if [ -s ${XBPS_STATEDIR}/gitrev ]; then
_gitrevs="$(<${XBPS_STATEDIR}/gitrev)" _gitrevs="$(<${XBPS_STATEDIR}/gitrev)"
@ -142,7 +142,7 @@ hook() {
_desc="${short_desc} (debug files)" _desc="${short_desc} (debug files)"
binpkg=${_pkgver}.${arch}.xbps binpkg=${_pkgver}.${arch}.xbps
PKGDESTDIR="${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-dbg-${version}" PKGDESTDIR="${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-dbg-${version}"
genpkg ${repo} ${arch} "${_desc}" ${_pkgver} ${binpkg} genpkg ${repo} ${arch} "${_desc}" ${_pkgver} ${binpkg} -dbg
fi fi
# Generate 32bit pkg. # Generate 32bit pkg.
if [ "$XBPS_TARGET_MACHINE" != "i686" ]; then if [ "$XBPS_TARGET_MACHINE" != "i686" ]; then
@ -161,6 +161,6 @@ hook() {
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}" [ -n "${_replaces}" ] && export replaces="${_replaces}"
genpkg ${repo} x86_64 "${_desc}" ${_pkgver} ${binpkg} genpkg ${repo} x86_64 "${_desc}" ${_pkgver} ${binpkg} -32bit
fi fi
} }

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

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