From 7436cebdd5e027d7b7e144e0dc403934c1d616db Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 30 Nov 2022 11:11:30 -0500 Subject: pre-pkg/04-generate-runtime-deps.sh: avoid conflict with `broken` template var Using a non-local `broken` variable in the hook common/hooks/prepkg/04-generate-runtime-deps.sh will cause a spurious shlib error when building templates marked broken are built with `xbps-src -b`. Declaring the variable local is sufficient, but let's make the name a bit more distinctive anyway. --- common/hooks/pre-pkg/04-generate-runtime-deps.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh index eb19ebfe708..8eace6c683e 100644 --- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh +++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh @@ -46,7 +46,7 @@ store_pkgdestdir_rundeps() { } hook() { - local depsftmp f lf j mapshlibs sorequires _curdep elfmagic + local depsftmp f lf j mapshlibs sorequires _curdep elfmagic broken_shlibs # Disable trap on ERR, xbps-uhelper cmd might return error... but not something # to be worried about because if there are broken shlibs this hook returns @@ -100,7 +100,7 @@ hook() { soname=$(find ${PKGDESTDIR} -name "$f") if [ -z "$soname" ]; then msg_red_nochroot " SONAME: $f <-> UNKNOWN PKG PLEASE FIX!\n" - broken=1 + broken_shlibs=1 else echo " SONAME: $f <-> $pkgname (ignored)" fi @@ -129,7 +129,7 @@ hook() { _rdepver=$($XBPS_UHELPER_CMD getpkgversion "${_rdep}" 2>/dev/null) if [ -z "${_pkgname}" -o -z "${_rdepver}" ]; then msg_red_nochroot " SONAME: $f <-> UNKNOWN PKG PLEASE FIX!\n" - broken=1 + broken_shlibs=1 continue fi # Check if pkg is a subpkg of sourcepkg; if true, ignore version @@ -155,7 +155,7 @@ hook() { # # If pkg uses any unknown SONAME error out. # - if [ -n "$broken" -a -z "$allow_unknown_shlibs" ]; then + if [ -n "$broken_shlibs" -a -z "$allow_unknown_shlibs" ]; then msg_error "$pkgver: cannot guess required shlibs, aborting!\n" fi -- cgit v1.2.3 value='user/luca/gnirehtet'>user/luca/gnirehtet The Void source packages collectionVoid Linux Contributors
aboutsummaryrefslogtreecommitdiff
path: root/common/hooks (unfollow)
Commit message (Collapse)AuthorFilesLines
2024-04-24pspg: update to 5.8.4.Leah Neukirchen1-2/+2
2024-04-24ruby: update to 3.2.4.Leah Neukirchen1-2/+2
2024-04-24ghidra: don't rewrite python shebangsclassabbyamp1-2/+2
2024-04-24common: support disabling python shebang rewritingclassabbyamp3-2/+8
useful if there are special python-containing shebangs that should not be rewritten, for example with Ghidra's embedded jython.
2024-04-24ssh-audit: update to 3.2.0.Andrew Benson1-2/+2
2024-04-24python3-tinycss2: update to 1.3.0.Andrew Benson1-3/+3
2024-04-24python3-Pyphen: update to 0.15.0.Andrew Benson1-3/+3
2024-04-24python3-art: update to 6.2.Andrew Benson1-3/+3
2024-04-24jadx: update to 1.5.0.Andrew Benson1-3/+3
2024-04-24io.elementary.files: update to 6.5.3.Pulux1-5/+3
Close: #50001
2024-04-24chromium: update to 124.0.6367.60.Duncaen7-117/+140
2024-04-24PrismLauncher: update to 8.3.SpidFightFR1-2/+2
2024-04-24dinit: update to 0.18.0dkwo1-3/+2
2024-04-23update-check: better pattern for Python 3Đoàn Trần Công Danh115-123/+1
2024-04-23libopenshot-audio: update to 0.3.2.Đoàn Trần Công Danh1-3/+3
2024-04-23libopenshot: update to 0.3.2.Đoàn Trần Công Danh3-9/+60
2024-04-23perl-DateTime-TimeZone: update to 2.62.Đoàn Trần Công Danh1-3/+3
2024-04-23mame: update to 0264.Elaine Gibson3-111/+51
2024-04-23mpv: update to 0.38.0.iFoundSilentHouse1-4/+3
2024-04-23qownnotes: update to 24.4.2cinerea01-2/+2