From e0bbfb5682cd6751aacf6217f9da3881016b9182 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Fri, 13 Jan 2023 11:11:45 +1000 Subject: [PATCH] libmakepkg: ensure clearing of buildflags happens first When 'options=('!buildflags') is used, we want to ensure our buildflags are cleared first. Currently this happens due to luck of alphabetical ordering, but this could change with libmakepkg drop-ins. Signed-off-by: Allan McRae --- scripts/libmakepkg/buildenv.sh.in | 3 +++ scripts/libmakepkg/buildenv/buildflags.sh.in | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/libmakepkg/buildenv.sh.in b/scripts/libmakepkg/buildenv.sh.in index a75ead9c..ff0832a6 100644 --- a/scripts/libmakepkg/buildenv.sh.in +++ b/scripts/libmakepkg/buildenv.sh.in @@ -34,6 +34,9 @@ done readonly -a buildenv_functions buildenv_vars build_options prepare_buildenv() { + # ensure this function runs first + buildenv_buildflags + for func in ${buildenv_functions[@]}; do $func done diff --git a/scripts/libmakepkg/buildenv/buildflags.sh.in b/scripts/libmakepkg/buildenv/buildflags.sh.in index 66a17861..163f0206 100644 --- a/scripts/libmakepkg/buildenv/buildflags.sh.in +++ b/scripts/libmakepkg/buildenv/buildflags.sh.in @@ -26,7 +26,6 @@ LIBRARY=${LIBRARY:-'@libmakepkgdir@'} source "$LIBRARY/util/option.sh" build_options+=('buildflags') -buildenv_functions+=('buildenv_buildflags') buildenv_buildflags() { if check_option "buildflags" "n"; then