lint_config/variable.sh support configuration additions via a subdirectory

This commit is contained in:
loqs 2024-01-18 19:35:49 +00:00
parent 69710adcd4
commit cc7f0b390d
No known key found for this signature in database

View file

@ -2,7 +2,7 @@
# #
# variable.sh - Check that variables are or are not arrays as appropriate # variable.sh - Check that variables are or are not arrays as appropriate
# #
# Copyright (c) 2018-2022 Pacman Development Team <pacman-dev@lists.archlinux.org> # Copyright (c) 2018-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
@ -24,6 +24,7 @@ LIBMAKEPKG_LINT_CONFIG_VARIABLE_SH=1
MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'} MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
source "$MAKEPKG_LIBRARY/util/message.sh" source "$MAKEPKG_LIBRARY/util/message.sh"
source "$MAKEPKG_LIBRARY/buildenv.sh"
lint_config_functions+=('lint_config_variables') lint_config_functions+=('lint_config_variables')
@ -32,10 +33,10 @@ lint_config_variables() {
local array=(DLAGENTS VCSCLIENTS BUILDENV OPTIONS INTEGRITY_CHECK MAN_DIRS local array=(DLAGENTS VCSCLIENTS BUILDENV OPTIONS INTEGRITY_CHECK MAN_DIRS
DOC_DIRS PURGE_TARGETS COMPRESSGZ COMPRESSBZ2 COMPRESSXZ DOC_DIRS PURGE_TARGETS COMPRESSGZ COMPRESSBZ2 COMPRESSXZ
COMPRESSLRZ COMPRESSLZO COMPRESSZ) COMPRESSLRZ COMPRESSLZO COMPRESSZ)
local string=(CARCH CHOST CPPFLAGS CFLAGS CXXFLAGS LDFLAGS LTOFLAGS DEBUG_CFLAGS local string=(CARCH CHOST LDFLAGS LTOFLAGS DISTCC_HOSTS BUILDDIR
DEBUG_CXXFLAGS DISTCC_HOSTS BUILDDIR STRIP_BINARIES STRIP_SHARED STRIP_BINARIES STRIP_SHARED STRIP_STATIC PKGDEST SRCDEST
STRIP_STATIC PKGDEST SRCDEST SRCPKGDEST LOGDEST PACKAGER GPGKEY SRCPKGDEST LOGDEST PACKAGER GPGKEY PKGEXT SRCEXT
PKGEXT SRCEXT) ${buildenv_vars[@]} ${buildenv_vars_exported[@]})
local i keys ret=0 local i keys ret=0