diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-03-09 13:18:32 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-03-09 13:18:32 +0100 |
| commit | 610c9247676415d7ff94304ceca23b38fa1c1c42 (patch) | |
| tree | 66339bc281d8875089ada6f5fd3b9d4f949f0e38 /mk | |
| parent | e71944b09a52167c3dc325a56104b564c8fc0ffd (diff) | |
| download | embtoolkit-610c9247676415d7ff94304ceca23b38fa1c1c42.tar.gz embtoolkit-610c9247676415d7ff94304ceca23b38fa1c1c42.tar.bz2 embtoolkit-610c9247676415d7ff94304ceca23b38fa1c1c42.tar.xz | |
Build system: internal macros: preset installed variable while including package
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/pkg-macros/clean.mk | 2 | ||||
| -rw-r--r-- | mk/pkg-macros/incl.mk | 14 | ||||
| -rw-r--r-- | mk/pkg-macros/install.mk | 4 |
3 files changed, 16 insertions, 4 deletions
diff --git a/mk/pkg-macros/clean.mk b/mk/pkg-macros/clean.mk index 21dda89..0f2493a 100644 --- a/mk/pkg-macros/clean.mk +++ b/mk/pkg-macros/clean.mk @@ -53,7 +53,7 @@ define __embtk_cleanup_pkg $(call __embtk_unsetinstalled_pkg,$(1)), $(if $(__embtk_pkg_builddir),rm -rf $(__embtk_pkg_builddir)*)) $(if $(__embtk_pkg_statedir),rm -rf $(__embtk_pkg_statedir)) - $(eval __embtk_$(pkgv)_installed :=) + $(eval __embtk_$(pkgv)_installed =) endef define embtk_cleanup_pkg diff --git a/mk/pkg-macros/incl.mk b/mk/pkg-macros/incl.mk index 8a73cc9..3a8cc5a 100644 --- a/mk/pkg-macros/incl.mk +++ b/mk/pkg-macros/incl.mk @@ -27,7 +27,7 @@ # Macros to include a package in the build system # $(1): pkgname => pkgname/pkgname.mk should exist (required) # $(2): kconfig: package specific kconfig symbol name used in .kconfig -# This is parameter is optional. +# This parameter is optional. define embtk_include_pkg $(eval $(call __embtk_include_pkg,$(1),$(2))) endef @@ -49,6 +49,12 @@ define __embtk_include_pkg else ifeq (x$(__embtk_incinstalled-y),xy) ROOTFS_COMPONENTS- += $(pkgv)_install endif + # Preset build system installed variable for this packages, if installed + ifeq (x$(__embtk_incinstalled-y),xy) + __embtk_$(pkgv)_installed = y + else + __embtk_$(pkgv)_installed = + endif endef define embtk_include_hostpkg @@ -75,4 +81,10 @@ define __embtk_include_hostpkg else ifeq (x$(__embtk_incinstalled-y),xy) HOSTTOOLS_COMPONENTS- += $(pkgv)_install endif + # Preset build system installed variable for this packages, if installed + ifeq (x$(__embtk_incinstalled-y),xy) + __embtk_$(pkgv)_installed = y + else + __embtk_$(pkgv)_installed = + endif endef diff --git a/mk/pkg-macros/install.mk b/mk/pkg-macros/install.mk index 07d1f32..5b16ef1 100644 --- a/mk/pkg-macros/install.mk +++ b/mk/pkg-macros/install.mk @@ -176,7 +176,7 @@ define __embtk_install_pkg_make $(call __embtk_fix_pkgconfig_files)) $(call __embtk_setinstalled_pkg,$(1)) $(call __embtk_pkg_gen_dotkconfig_f,$(1)) - $(eval __embtk_$(pkgv)_installed := y) + $(eval __embtk_$(pkgv)_installed = y) endef define __embtk_install_hostpkg_make $(Q)$(if $(__embtk_pkg_deps),$(MAKE) $(__embtk_pkg_deps)) @@ -193,7 +193,7 @@ define __embtk_install_hostpkg_make $(__embtk_single_make_hostinstall)) $(call __embtk_setinstalled_pkg,$(1)) $(call __embtk_pkg_gen_dotkconfig_f,$(1)) - $(eval __embtk_$(pkgv)_installed := y) + $(eval __embtk_$(pkgv)_installed = y) endef # |