From 614ef781ebf8ef7ae116c26d419bc9002c162599 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Tue, 16 Apr 2019 13:12:39 -0400 Subject: libmakepkg: fix missing or inaccurate interdependencies When the executable checking was refactored into libmakepkg, it carried with it, usage of $E_* error codes, which need to be declared from error.sh but are only available when the parent program already sources error.sh; additionally, message.sh was only loaded in a parent library, but not where it was needed, and option.sh was often loaded when it wasn't needed at all. util.sh, meanwhile, has always depended on message.sh functions. Signed-off-by: Eli Schwartz Signed-off-by: Allan McRae --- scripts/libmakepkg/buildenv.sh.in | 5 ----- 1 file changed, 5 deletions(-) (limited to 'scripts/libmakepkg/buildenv.sh.in') diff --git a/scripts/libmakepkg/buildenv.sh.in b/scripts/libmakepkg/buildenv.sh.in index bb1c73bc..a8d416c8 100644 --- a/scripts/libmakepkg/buildenv.sh.in +++ b/scripts/libmakepkg/buildenv.sh.in @@ -22,11 +22,6 @@ [[ -n "$LIBMAKEPKG_BUILDENV_SH" ]] && return LIBMAKEPKG_BUILDENV_SH=1 -LIBRARY=${LIBRARY:-'@libmakepkgdir@'} - -source "$LIBRARY/util/message.sh" - - declare -a buildenv_functions build_options for lib in "$LIBRARY/buildenv/"*.sh; do -- cgit v1.2.3-54-g00ecf