summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2014-09-14 18:21:03 +0200
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2014-09-14 18:31:22 +0200
commitaf42fc95ba07da6d2bb0b95af663c2f01fe7c1eb (patch)
tree60d4b9c16a3913d2e86dff4fbba1f72e70ba008c
parentbcc1107f74484223caba3fa777582321c551f222 (diff)
downloadembtoolkit-af42fc95ba07da6d2bb0b95af663c2f01fe7c1eb.tar.gz
embtoolkit-af42fc95ba07da6d2bb0b95af663c2f01fe7c1eb.tar.bz2
embtoolkit-af42fc95ba07da6d2bb0b95af663c2f01fe7c1eb.tar.xz
Build system internals __embtk_pkg_depof: take into account toolchain deps move to install.mk
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
-rw-r--r--core/mk/pkg-macros/download.mk6
-rw-r--r--core/mk/pkg-macros/install.mk6
2 files changed, 6 insertions, 6 deletions
diff --git a/core/mk/pkg-macros/download.mk b/core/mk/pkg-macros/download.mk
index e7dde39..3042594 100644
--- a/core/mk/pkg-macros/download.mk
+++ b/core/mk/pkg-macros/download.mk
@@ -46,12 +46,6 @@ endef
# $(call embtk_download_pkg,PACKAGE)
#
-__embtk_pkg_depof = $(strip $(sort $(___embtk_pkg_depof)))
-define ___embtk_pkg_depof
- $(foreach p,$(__embtk_pkgs_all-y) toolchain toolchain_addons,
- $(if $(findstring $(pkgv),$($(call PKGV,$(p)_deps))),$(p)))
-endef
-
__embtk_pkg_needpatch_yesno = $(if $(__embtk_pkg_needpatch),Yes,No)
define __embtk_download_pkg_patches
diff --git a/core/mk/pkg-macros/install.mk b/core/mk/pkg-macros/install.mk
index 2d03a3c..925d918 100644
--- a/core/mk/pkg-macros/install.mk
+++ b/core/mk/pkg-macros/install.mk
@@ -78,6 +78,12 @@ __embtk_hosttools_nrpkgs-n = $(words $(__embtk_hosttools_pkgs-n))
__embtk_pkgs_all-y = $(__embtk_rootfs_pkgs-y) $(__embtk_hosttools_pkgs-y)
__embtk_pkgs_nrall-y = $(words $(__embtk_pkgs_all-y))
+__embtk_pkg_depof = $(strip $(sort $(___embtk_pkg_depof)))
+define ___embtk_pkg_depof
+ $(foreach p,$(__embtk_pkgs_all-y) $(__embtk_toolchain_deps-y) $(__embtk_toolchain_predeps-y) $(__embtk_toolchain_addons-y),
+ $(if $(findstring $(pkgv),$($(call PKGV,$(p)_deps))),$(p)))
+endef
+
#
# A macro to get packages version from .config file.
# usage: $(call embtk_get_pkgversion,PACKAGE)