Rename base_dep_prepend and autotools_dep_prepend

When we start including methodpool funcs in the metadata, these blow up, since
the _prepend gets evaluated at finalize time.

Signed-off-by: Chris Larson <chris_larson@mentor.com>

diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index 8a5b982..754fb87 100644 (file)
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -1,7 +1,7 @@
 # use autotools_stage_all for native packages
 AUTOTOOLS_NATIVE_STAGE_INSTALL = "1"
 
-def autotools_dep_prepend(d):
+def autotools_deps(d):
        if bb.data.getVar('INHIBIT_AUTOTOOLS_DEPS', d, 1):
                return ''
 
@@ -24,9 +24,9 @@ def autotools_dep_prepend(d):
 
 EXTRA_OEMAKE = ""
 
-DEPENDS_prepend = "${@autotools_dep_prepend(d)}"
-DEPENDS_virtclass-native_prepend = "${@autotools_dep_prepend(d)}"
-DEPENDS_virtclass-nativesdk_prepend = "${@autotools_dep_prepend(d)}"
+DEPENDS_prepend = "${@autotools_deps(d)}"
+DEPENDS_virtclass-native_prepend = "${@autotools_deps(d)}"
+DEPENDS_virtclass-nativesdk_prepend = "${@autotools_deps(d)}"
 
 inherit siteinfo
 

diff --git a/classes/base.bbclass b/classes/base.bbclass
index e26a45e..3995ac8 100644 (file)
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -57,7 +57,7 @@ oe_runmake() {
        ${MAKE} ${EXTRA_OEMAKE} "$@" || die "oe_runmake failed"
 }
 
-def base_dep_prepend(d):
+def base_deps(d):
        #
        # Ideally this will check a flag so we will operate properly in
        # the case where host == build == target, for now we don't work in
@@ -83,9 +83,9 @@ def base_dep_prepend(d):
                        deps += " linux-libc-headers-native"
        return deps
 
-DEPENDS_prepend="${@base_dep_prepend(d)} "
-DEPENDS_virtclass-native_prepend="${@base_dep_prepend(d)} "
-DEPENDS_virtclass-nativesdk_prepend="${@base_dep_prepend(d)} "
+DEPENDS_prepend="${@base_deps(d)} "
+DEPENDS_virtclass-native_prepend="${@base_deps(d)} "
+DEPENDS_virtclass-nativesdk_prepend="${@base_deps(d)} "
 
 
 SCENEFUNCS += "base_scenefunction"