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

Add and use check_append_debug_flags

Browse source
This commit is contained in:
loqs 2024-01-18 14:56:50 +00:00
parent 3c28c30133
commit e41d018398
No known key found for this signature in database
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
scripts/libmakepkg/buildenv.sh.in
View file

@ -33,6 +33,19 @@ done
readonly -a buildenv_functions buildenv_vars build_options readonly -a buildenv_functions buildenv_vars build_options
check_append_debug_flags() {
local -n flag=$1
local -n debug_flag=$2
if check_option "debug" "y" && ! check_option "buildflags" "n"; then
if [[ $# -gt 1 ]]; then
local debug_extra=$3
append_once debug_flag "$debug_extra"
fi
append_once flag "$debug_flag"
fi
}
prepare_buildenv() { prepare_buildenv() {
# ensure this function runs first # ensure this function runs first
buildenv_buildflags buildenv_buildflags

7
scripts/libmakepkg/buildenv/rust.sh.in
View file

@ -2,7 +2,7 @@
# #
# rust.sh - Specify flags for building a package with rust # rust.sh - Specify flags for building a package with rust
# #
# Copyright (c) 2022 Pacman Development Team <pacman-dev@lists.archlinux.org> # Copyright (c) 2022-2024 Pacman Development Team <pacman-dev@lists.archlinux.org>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -30,8 +30,5 @@ buildenv_vars+=('RUSTFLAGS' 'DEBUG_RUSTFLAGS')
buildenv_functions+=('buildenv_rust') buildenv_functions+=('buildenv_rust')
buildenv_rust() { buildenv_rust() {
if check_option "debug" "y" && ! check_option "buildflags" "n"; then check_append_debug_flags RUSTFLAGS DEBUG_RUSTFLAGS "--remap-path-prefix=$srcdir=${DBGSRCDIR:-/usr/src/debug}/${pkgbase}"
append_once DEBUG_RUSTFLAGS "--remap-path-prefix=$srcdir=${DBGSRCDIR:-/usr/src/debug}/${pkgbase}"
append_once RUSTFLAGS "$DEBUG_RUSTFLAGS"
fi
} }