mirror of
https://git.yoctoproject.org/poky
synced 2026-03-06 15:29:40 +01:00
base: Simplify BASEDEPENDS construction
This code dates from distant times before we had class overrides. The comments are also rather stale. Rewrite this code using class overrides which makes it safer, more modern and more easily understandable. (From OE-Core rev: fb3b160a6bf20a601d6cecf3f06a2b71c03fa91f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -61,22 +61,15 @@ oe_runmake() {
|
||||
|
||||
|
||||
def base_dep_prepend(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
|
||||
# that case though.
|
||||
#
|
||||
if d.getVar('INHIBIT_DEFAULT_DEPS', False):
|
||||
return ""
|
||||
return "${BASE_DEFAULT_DEPS}"
|
||||
|
||||
deps = ""
|
||||
# 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.
|
||||
if not d.getVar('INHIBIT_DEFAULT_DEPS', False):
|
||||
if (d.getVar('HOST_SYS') != d.getVar('BUILD_SYS')):
|
||||
deps += " virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}compilerlibs virtual/libc "
|
||||
return deps
|
||||
BASE_DEFAULT_DEPS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}compilerlibs virtual/libc"
|
||||
|
||||
BASEDEPENDS = "${@base_dep_prepend(d)}"
|
||||
BASEDEPENDS = ""
|
||||
BASEDEPENDS_class-target = "${@base_dep_prepend(d)}"
|
||||
BASEDEPENDS_class-nativesdk = "${@base_dep_prepend(d)}"
|
||||
|
||||
DEPENDS_prepend="${BASEDEPENDS} "
|
||||
|
||||
|
||||
@@ -15,5 +15,5 @@ def gettext_oeconf(d):
|
||||
|
||||
DEPENDS_GETTEXT ??= "virtual/gettext gettext-native"
|
||||
|
||||
BASEDEPENDS =+ "${@gettext_dependencies(d)}"
|
||||
BASEDEPENDS_append = " ${@gettext_dependencies(d)}"
|
||||
EXTRA_OECONF_append = " ${@gettext_oeconf(d)}"
|
||||
|
||||
Reference in New Issue
Block a user