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

Split out CXXFLAGS and DEBUG_CXXFLAGS

Browse source
This commit is contained in:
loqs 2024-01-16 22:51:23 +00:00
parent 735d1b0073
commit 34e8c3b26e
No known key found for this signature in database
4 changed files with 38 additions and 3 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@'}
declare -a buildenv_functions buildenv_vars build_options
buildenv_vars_exported=('CXXFLAGS' 'LDFLAGS' 'MAKEFLAGS' 'CHOST')
buildenv_vars_exported=('LDFLAGS' 'MAKEFLAGS' 'CHOST')
for lib in "$MAKEPKG_LIBRARY/buildenv/"*.sh; do
source "$lib"

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

@ -0,0 +1,35 @@
#!/usr/bin/bash
#
# cxx.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_CXX_SH" ]] && return
LIBMAKEPKG_BUILDENV_CXX_SH=1
MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
source "$MAKEPKG_LIBRARY/util/option.sh"
source "$MAKEPKG_LIBRARY/util/util.sh"
buildenv_vars+=('DEBUG_CXXFLAGS')
buildenv_vars_exported+=('CXXFLAGS')
buildenv_functions+=('buildenv_cxx')
buildenv_cxx() {
check_append_debug_flags CXXFLAGS DEBUG_CXXFLAGS "-ffile-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}/${pkgbase}"
}

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

@ -31,7 +31,6 @@ buildenv_functions+=('buildenv_debugflags')
buildenv_debugflags() {
if check_option "debug" "y" && ! check_option "buildflags" "n"; then
append_once DEBUG_CXXFLAGS "-ffile-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}/${pkgbase}"
append_once CXXFLAGS "$DEBUG_CXXFLAGS"
:
fi
}

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

@ -5,6 +5,7 @@ sources = [
'c.sh.in',
'compiler.sh.in',
'cpp.sh.in',
'cxx.sh.in',
'debugflags.sh.in',
'lto.sh.in',
'makeflags.sh.in',