bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

strip: fix unique source paths

Browse source 
`${pkgbase}` was added to the wrong invocation. This ensures we are
producing correct debug packages.

Example from the package:

    /usr/src/debug/pacman/pacman-6.0.2/src/pacman/callback.c
    /usr/src/debug/pacman/pacman-6.0.2/src/pacman/callback.h
    /usr/src/debug/pacman/pacman-6.0.2/src/pacman/check.c
    /usr/src/debug/pacman/pacman-6.0.2/src/pacman/check.h

Fixes: 776b7c1e75 ("debugflags: Ensure we have unique source paths")
Signed-off-by: Morten Linderud <morten@linderud.pw>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Morten Linderud 2022-10-06 12:03:14 +02:00 • committed by Allan McRae
parent efd0c24c07
commit 478af273df
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/libmakepkg/tidy/strip.sh.in
View file

@ -47,7 +47,7 @@ source_files() {
LANG=C debugedit --no-recompute-build-id \ LANG=C debugedit --no-recompute-build-id \
--base-dir "${srcdir}" \ --base-dir "${srcdir}" \
--dest-dir "${dbgsrcdir}/${pkgbase}" \ --dest-dir "${dbgsrcdir}" \
--list-file /dev/stdout "$1" \ --list-file /dev/stdout "$1" \
| sort -zu | tr '\0' '\n' | sort -zu | tr '\0' '\n'
} }
@ -141,7 +141,7 @@ tidy_strip() {
if check_option "debug" "y"; then if check_option "debug" "y"; then
dbgdir="$pkgdirbase/$pkgbase-@DEBUGSUFFIX@/usr/lib/debug" dbgdir="$pkgdirbase/$pkgbase-@DEBUGSUFFIX@/usr/lib/debug"
dbgsrcdir="${DBGSRCDIR:-/usr/src/debug}" dbgsrcdir="${DBGSRCDIR:-/usr/src/debug}/${pkgbase}"
dbgsrc="$pkgdirbase/$pkgbase-@DEBUGSUFFIX@$dbgsrcdir" dbgsrc="$pkgdirbase/$pkgbase-@DEBUGSUFFIX@$dbgsrcdir"
mkdir -p "$dbgdir" "$dbgsrc" mkdir -p "$dbgdir" "$dbgsrc"
fi fi