1 |
--- |
2 |
eclass/scons-utils.eclass | 17 +++++++++++------ |
3 |
1 file changed, 11 insertions(+), 6 deletions(-) |
4 |
|
5 |
diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass |
6 |
index fe9160a0..fdc6af3 100644 |
7 |
--- a/eclass/scons-utils.eclass |
8 |
+++ b/eclass/scons-utils.eclass |
9 |
@@ -58,6 +58,8 @@ |
10 |
# @VARIABLE: myesconsargs |
11 |
# @DEFAULT_UNSET |
12 |
# @DESCRIPTION: |
13 |
+# DEPRECATED, EAPI 0..5 ONLY: pass options to escons instead |
14 |
+# |
15 |
# List of package-specific options to pass to all SCons calls. Supposed to be |
16 |
# set in src_configure(). |
17 |
|
18 |
@@ -103,20 +105,23 @@ fi |
19 |
# -- public functions -- |
20 |
|
21 |
# @FUNCTION: escons |
22 |
-# @USAGE: [scons-arg] ... |
23 |
+# @USAGE: [<args>...] |
24 |
# @DESCRIPTION: |
25 |
-# Call scons, passing the supplied arguments, ${myesconsargs[@]}, |
26 |
-# filtered ${MAKEOPTS}, ${EXTRA_ESCONS}. Similar to emake. Like emake, |
27 |
-# this function does die on failure in EAPI 4. Respects nonfatal |
28 |
-# in EAPI 6 and newer. |
29 |
+# Call scons, passing the supplied arguments. Like emake, this function |
30 |
+# does die on failure in EAPI 4. Respects nonfatal in EAPI 6 and newer. |
31 |
escons() { |
32 |
local ret |
33 |
|
34 |
debug-print-function ${FUNCNAME} "${@}" |
35 |
|
36 |
+ # Use myesconsargs in EAPI 5 and older |
37 |
+ if [[ ${EAPI} == [012345] ]]; then |
38 |
+ set -- "${myesconsargs[@]}" "${@}" |
39 |
+ fi |
40 |
+ |
41 |
# if SCONSOPTS are _unset_, use cleaned MAKEOPTS |
42 |
set -- scons ${SCONSOPTS-$(scons_clean_makeopts)} ${EXTRA_ESCONS} \ |
43 |
- "${myesconsargs[@]}" "${@}" |
44 |
+ "${@}" |
45 |
echo "${@}" >&2 |
46 |
"${@}" |
47 |
ret=${?} |
48 |
-- |
49 |
2.6.4 |