diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-29 15:21:56 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-30 00:11:33 +0100 |
commit | 9d002acae720b0a8e96a6734424a142b86880461 (patch) | |
tree | c6675b9af3c4fb11e3f0342441b82322b55adb4e | |
parent | 701a58504de15b244b970908f2de0971a35b5a09 (diff) | |
download | openembedded-core-contrib-9d002acae720b0a8e96a6734424a142b86880461.tar.gz |
autotools/base/icecc: Remove prepend from function names
Using prepend as part of a function name is a poor choice. Whilst we're
about to make the syntax explict, improve the names anyway making the
conversion easier and the intent clear that this isn't an override.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/autotools.bbclass | 4 | ||||
-rw-r--r-- | meta/classes/base.bbclass | 6 | ||||
-rw-r--r-- | meta/classes/icecc.bbclass | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index 9dc8ebdaa7..77d90a3df5 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -1,4 +1,4 @@ -def autotools_dep_prepend(d): +def get_autotools_dep(d): if d.getVar('INHIBIT_AUTOTOOLS_DEPS'): return '' @@ -19,7 +19,7 @@ def autotools_dep_prepend(d): return deps -DEPENDS_prepend = "${@autotools_dep_prepend(d)} " +DEPENDS_prepend = "${@get_autotools_dep(d)} " inherit siteinfo diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 42fb84c4d5..ff0579c7d6 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -66,7 +66,7 @@ oe_runmake() { } -def base_dep_prepend(d): +def get_base_dep(d): if d.getVar('INHIBIT_DEFAULT_DEPS', False): return "" return "${BASE_DEFAULT_DEPS}" @@ -74,8 +74,8 @@ def base_dep_prepend(d): BASE_DEFAULT_DEPS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}compilerlibs virtual/libc" BASEDEPENDS = "" -BASEDEPENDS_class-target = "${@base_dep_prepend(d)}" -BASEDEPENDS_class-nativesdk = "${@base_dep_prepend(d)}" +BASEDEPENDS_class-target = "${@get_base_dep(d)}" +BASEDEPENDS_class-nativesdk = "${@get_base_dep(d)}" DEPENDS_prepend="${BASEDEPENDS} " diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index 80943fcf02..089d52732f 100644 --- a/meta/classes/icecc.bbclass +++ b/meta/classes/icecc.bbclass @@ -97,7 +97,7 @@ ICECC_SYSTEM_CLASS_BL += "\ image \ " -def icecc_dep_prepend(d): +def get_icecc_dep(d): # INHIBIT_DEFAULT_DEPS doesn't apply to the patch command. Whether or not # we need that built is the responsibility of the patch function / class, not # the application. @@ -105,7 +105,7 @@ def icecc_dep_prepend(d): return "icecc-create-env-native" return "" -DEPENDS_prepend = "${@icecc_dep_prepend(d)} " +DEPENDS_prepend = "${@get_icecc_dep(d)} " get_cross_kernel_cc[vardepsexclude] += "KERNEL_CC" def get_cross_kernel_cc(bb,d): |