diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2016-01-01 13:52:26 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2016-01-08 06:14:36 +0100 |
| commit | a4de8aa2e9ef28100fb8834aaeb4495f66efb8d9 (patch) | |
| tree | bfdfea0045db511aea59db792c844a4f62e59053 | |
| parent | scons-utils.eclass: tests, be more verbose on tests being performed (diff) | |
| download | gentoo-a4de8aa2e9ef28100fb8834aaeb4495f66efb8d9.tar.gz gentoo-a4de8aa2e9ef28100fb8834aaeb4495f66efb8d9.tar.bz2 gentoo-a4de8aa2e9ef28100fb8834aaeb4495f66efb8d9.zip | |
scons-utils.eclass: scons_clean_makeopts, mark internal
| -rw-r--r-- | eclass/scons-utils.eclass | 7 | ||||
| -rwxr-xr-x | eclass/tests/scons-utils.sh | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass index b8051b04bf81..e5e309be13c4 100644 --- a/eclass/scons-utils.eclass +++ b/eclass/scons-utils.eclass @@ -124,7 +124,7 @@ escons() { fi # if SCONSOPTS are _unset_, use cleaned MAKEOPTS - set -- scons ${SCONSOPTS-$(scons_clean_makeopts)} ${EXTRA_ESCONS} \ + set -- scons ${SCONSOPTS-$(_scons_clean_makeopts)} ${EXTRA_ESCONS} \ "${@}" echo "${@}" >&2 "${@}" @@ -145,14 +145,15 @@ escons() { return ${ret} } -# @FUNCTION: scons_clean_makeopts +# @FUNCTION: _scons_clean_makeopts +# @INTERNAL # @USAGE: [makeflags] [...] # @DESCRIPTION: # Strip the supplied makeflags (or ${MAKEOPTS} if called without # an argument) of options not supported by SCons and make sure --jobs # gets an argument. Output the resulting flag list (suitable # for an assignment to SCONSOPTS). -scons_clean_makeopts() { +_scons_clean_makeopts() { local new_makeopts debug-print-function ${FUNCNAME} "${@}" diff --git a/eclass/tests/scons-utils.sh b/eclass/tests/scons-utils.sh index 73871353c84a..df8af7a7713c 100755 --- a/eclass/tests/scons-utils.sh +++ b/eclass/tests/scons-utils.sh @@ -10,7 +10,7 @@ inherit scons-utils test-scons_clean_makeopts() { tbegin "scons_clean_makeopts() for ${1}" - local sconsopts=$(scons_clean_makeopts ${1}) ret=0 + local sconsopts=$(_scons_clean_makeopts ${1}) ret=0 if [[ ${sconsopts} != ${2-${1}} ]]; then eerror "Self-test failed:" |