[pacman-dev] [PATCH] buildenv-functions

[Que Quotion]

From: Que Quotion <quequotion at gmail.com>

Signed-off-by: Que Quotion <quequotion at gmail.com>
---
 scripts/libmakepkg/buildenv.sh.in            | 6 +++---
 scripts/libmakepkg/buildenv/buildflags.sh.in | 2 +-
 scripts/libmakepkg/buildenv/compiler.sh.in   | 2 +-
 scripts/libmakepkg/buildenv/debugflags.sh.in | 2 +-
 scripts/libmakepkg/buildenv/makeflags.sh.in  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/libmakepkg/buildenv.sh.in b/scripts/libmakepkg/buildenv.sh.in
index 91e99780..b49b24bf 100644
--- a/scripts/libmakepkg/buildenv.sh.in
+++ b/scripts/libmakepkg/buildenv.sh.in
@@ -28,18 +28,18 @@ source "$LIBRARY/util/message.sh"
 source "$LIBRARY/util/option.sh"
 
 
-declare -a buildenv_options
+declare -a buildenv_functions
 
 for lib in "$LIBRARY/buildenv/"*.sh; do
 	source "$lib"
 done
 
-readonly -a buildenv_options
+readonly -a buildenv_functions
 
 prepare_buildenv() {
 	msg "$(gettext "Preparing build environment...")"
 
-	for func in ${buildenv_options[@]}; do
+	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 1a21241d..4bdfd6a1 100644
--- a/scripts/libmakepkg/buildenv/buildflags.sh.in
+++ b/scripts/libmakepkg/buildenv/buildflags.sh.in
@@ -25,7 +25,7 @@ LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
 source "$LIBRARY/util/option.sh"
 
-buildenv_options+=('buildenv_buildflags')
+buildenv_functions+=('buildenv_buildflags')
 
 buildenv_buildflags() {
 	if check_option "buildflags" "n"; then
diff --git a/scripts/libmakepkg/buildenv/compiler.sh.in b/scripts/libmakepkg/buildenv/compiler.sh.in
index b7bb1d65..384b94da 100644
--- a/scripts/libmakepkg/buildenv/compiler.sh.in
+++ b/scripts/libmakepkg/buildenv/compiler.sh.in
@@ -26,7 +26,7 @@ LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 source "$LIBRARY/util/message.sh"
 source "$LIBRARY/util/option.sh"
 
-buildenv_options+=('buildenv_ccache' 'buildenv_distcc')
+buildenv_functions+=('buildenv_ccache' 'buildenv_distcc')
 
 using_ccache=0
 
diff --git a/scripts/libmakepkg/buildenv/debugflags.sh.in b/scripts/libmakepkg/buildenv/debugflags.sh.in
index ac5f76db..65aa6c0a 100644
--- a/scripts/libmakepkg/buildenv/debugflags.sh.in
+++ b/scripts/libmakepkg/buildenv/debugflags.sh.in
@@ -26,7 +26,7 @@ LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
 source "$LIBRARY/util/option.sh"
 
-buildenv_options+=('buildenv_debugflags')
+buildenv_functions+=('buildenv_debugflags')
 
 buildenv_debugflags() {
 	if check_option "debug" "y"; then
diff --git a/scripts/libmakepkg/buildenv/makeflags.sh.in b/scripts/libmakepkg/buildenv/makeflags.sh.in
index 0e5bb36b..2d4a44c6 100644
--- a/scripts/libmakepkg/buildenv/makeflags.sh.in
+++ b/scripts/libmakepkg/buildenv/makeflags.sh.in
@@ -25,7 +25,7 @@ LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
 source "$LIBRARY/util/option.sh"
 
-buildenv_options+=('buildenv_makeflags')
+buildenv_functions+=('buildenv_makeflags')
 
 buildenv_makeflags() {
 	if check_option "makeflags" "n"; then
-- 
2.19.1