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

Split out CFLAGS and DEBUG_CFLAGS

Browse source
This commit is contained in:
loqs 2024-01-16 22:44:10 +00:00
parent 1e1c73e283
commit 735d1b0073
No known key found for this signature in database
4 changed files with 38 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,7 +25,7 @@ LIBMAKEPKG_BUILDENV_SH=1
MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'} MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
declare -a buildenv_functions buildenv_vars build_options declare -a buildenv_functions buildenv_vars build_options
buildenv_vars_exported=('CFLAGS' 'CXXFLAGS' 'LDFLAGS' 'MAKEFLAGS' 'CHOST') buildenv_vars_exported=('CXXFLAGS' 'LDFLAGS' 'MAKEFLAGS' 'CHOST')
for lib in "$MAKEPKG_LIBRARY/buildenv/"*.sh; do for lib in "$MAKEPKG_LIBRARY/buildenv/"*.sh; do
source "$lib" source "$lib"

35
scripts/libmakepkg/buildenv/c.sh.in Normal file
View file

@ -0,0 +1,35 @@
#!/usr/bin/bash
#
# c.sh - Specify flags for building a package with C
#
# Copyright (c) 2024 Pacman Development Team <pacman-dev@lists.archlinux.org>
#
# 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
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
[[ -n "$LIBMAKEPKG_BUILDENV_C_SH" ]] && return
LIBMAKEPKG_BUILDENV_C_SH=1
MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
source "$MAKEPKG_LIBRARY/util/option.sh"
source "$MAKEPKG_LIBRARY/util/util.sh"
buildenv_vars+=('DEBUG_CFLAGS')
buildenv_vars_exported+=('CFLAGS')
buildenv_functions+=('buildenv_c')
buildenv_c() {
check_append_debug_flags CFLAGS DEBUG_CFLAGS "-ffile-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}/${pkgbase}"
}

4
scripts/libmakepkg/buildenv/debugflags.sh.in
View file

@ -3,7 +3,7 @@
# debugflags.sh - Specify flags for building a package with debugging # debugflags.sh - Specify flags for building a package with debugging
# symbols # symbols
# #
# Copyright (c) 2012-2022 Pacman Development Team <pacman-dev@lists.archlinux.org> # Copyright (c) 2012-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
@ -31,9 +31,7 @@ buildenv_functions+=('buildenv_debugflags')
buildenv_debugflags() { buildenv_debugflags() {
if check_option "debug" "y" && ! check_option "buildflags" "n"; then if check_option "debug" "y" && ! check_option "buildflags" "n"; then
append_once DEBUG_CFLAGS "-ffile-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}/${pkgbase}"
append_once DEBUG_CXXFLAGS "-ffile-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}/${pkgbase}" append_once DEBUG_CXXFLAGS "-ffile-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}/${pkgbase}"
append_once CFLAGS "$DEBUG_CFLAGS"
append_once CXXFLAGS "$DEBUG_CXXFLAGS" append_once CXXFLAGS "$DEBUG_CXXFLAGS"
fi fi
} }

1
scripts/libmakepkg/buildenv/meson.build
View file

@ -2,6 +2,7 @@ libmakepkg_module = 'buildenv'
sources = [ sources = [
'buildflags.sh.in', 'buildflags.sh.in',
'c.sh.in',
'compiler.sh.in', 'compiler.sh.in',
'cpp.sh.in', 'cpp.sh.in',
'debugflags.sh.in', 'debugflags.sh.in',