| 1 |
--- |
| 2 |
eclass/scons-utils.eclass | 7 ++++--- |
| 3 |
eclass/tests/scons-utils.sh | 2 +- |
| 4 |
2 files changed, 5 insertions(+), 4 deletions(-) |
| 5 |
|
| 6 |
diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass |
| 7 |
index b8051b0..e5e309b 100644 |
| 8 |
--- a/eclass/scons-utils.eclass |
| 9 |
+++ b/eclass/scons-utils.eclass |
| 10 |
@@ -124,7 +124,7 @@ escons() { |
| 11 |
fi |
| 12 |
|
| 13 |
# if SCONSOPTS are _unset_, use cleaned MAKEOPTS |
| 14 |
- set -- scons ${SCONSOPTS-$(scons_clean_makeopts)} ${EXTRA_ESCONS} \ |
| 15 |
+ set -- scons ${SCONSOPTS-$(_scons_clean_makeopts)} ${EXTRA_ESCONS} \ |
| 16 |
"${@}" |
| 17 |
echo "${@}" >&2 |
| 18 |
"${@}" |
| 19 |
@@ -145,14 +145,15 @@ escons() { |
| 20 |
return ${ret} |
| 21 |
} |
| 22 |
|
| 23 |
-# @FUNCTION: scons_clean_makeopts |
| 24 |
+# @FUNCTION: _scons_clean_makeopts |
| 25 |
+# @INTERNAL |
| 26 |
# @USAGE: [makeflags] [...] |
| 27 |
# @DESCRIPTION: |
| 28 |
# Strip the supplied makeflags (or ${MAKEOPTS} if called without |
| 29 |
# an argument) of options not supported by SCons and make sure --jobs |
| 30 |
# gets an argument. Output the resulting flag list (suitable |
| 31 |
# for an assignment to SCONSOPTS). |
| 32 |
-scons_clean_makeopts() { |
| 33 |
+_scons_clean_makeopts() { |
| 34 |
local new_makeopts |
| 35 |
|
| 36 |
debug-print-function ${FUNCNAME} "${@}" |
| 37 |
diff --git a/eclass/tests/scons-utils.sh b/eclass/tests/scons-utils.sh |
| 38 |
index 7387135..df8af7a 100755 |
| 39 |
--- a/eclass/tests/scons-utils.sh |
| 40 |
+++ b/eclass/tests/scons-utils.sh |
| 41 |
@@ -10,7 +10,7 @@ inherit scons-utils |
| 42 |
test-scons_clean_makeopts() { |
| 43 |
tbegin "scons_clean_makeopts() for ${1}" |
| 44 |
|
| 45 |
- local sconsopts=$(scons_clean_makeopts ${1}) ret=0 |
| 46 |
+ local sconsopts=$(_scons_clean_makeopts ${1}) ret=0 |
| 47 |
|
| 48 |
if [[ ${sconsopts} != ${2-${1}} ]]; then |
| 49 |
eerror "Self-test failed:" |
| 50 |
-- |
| 51 |
2.6.4 |
Archives