From cc7f0b390dcaef17868069aa5e4a754097f6921f Mon Sep 17 00:00:00 2001 From: loqs <2227-loqs@users.noreply.gitlab.archlinux.org> Date: Thu, 18 Jan 2024 19:35:49 +0000 Subject: [PATCH] lint_config/variable.sh support configuration additions via a subdirectory --- scripts/libmakepkg/lint_config/variable.sh.in | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/libmakepkg/lint_config/variable.sh.in b/scripts/libmakepkg/lint_config/variable.sh.in index 664230f9..db88618f 100644 --- a/scripts/libmakepkg/lint_config/variable.sh.in +++ b/scripts/libmakepkg/lint_config/variable.sh.in @@ -2,7 +2,7 @@ # # variable.sh - Check that variables are or are not arrays as appropriate # -# Copyright (c) 2018-2022 Pacman Development Team +# Copyright (c) 2018-2024 Pacman Development Team # # 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 @@ -24,6 +24,7 @@ LIBMAKEPKG_LINT_CONFIG_VARIABLE_SH=1 MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'} source "$MAKEPKG_LIBRARY/util/message.sh" +source "$MAKEPKG_LIBRARY/buildenv.sh" lint_config_functions+=('lint_config_variables') @@ -32,10 +33,10 @@ lint_config_variables() { local array=(DLAGENTS VCSCLIENTS BUILDENV OPTIONS INTEGRITY_CHECK MAN_DIRS DOC_DIRS PURGE_TARGETS COMPRESSGZ COMPRESSBZ2 COMPRESSXZ COMPRESSLRZ COMPRESSLZO COMPRESSZ) - local string=(CARCH CHOST CPPFLAGS CFLAGS CXXFLAGS LDFLAGS LTOFLAGS DEBUG_CFLAGS - DEBUG_CXXFLAGS DISTCC_HOSTS BUILDDIR STRIP_BINARIES STRIP_SHARED - STRIP_STATIC PKGDEST SRCDEST SRCPKGDEST LOGDEST PACKAGER GPGKEY - PKGEXT SRCEXT) + local string=(CARCH CHOST LDFLAGS LTOFLAGS DISTCC_HOSTS BUILDDIR + STRIP_BINARIES STRIP_SHARED STRIP_STATIC PKGDEST SRCDEST + SRCPKGDEST LOGDEST PACKAGER GPGKEY PKGEXT SRCEXT + ${buildenv_vars[@]} ${buildenv_vars_exported[@]}) local i keys ret=0