diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-01-11 12:45:26 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-01-11 13:27:21 +0100 |
| commit | 33e6854d9f942e374fb9a20715e44aceb875eff9 (patch) | |
| tree | e1c125de60831900040ac964e8afff41dbf43b31 /mk/macros.packages.mk | |
| parent | 011948bd4b09f416eee02f5773d57e371336af9d (diff) | |
| download | embtoolkit-33e6854d9f942e374fb9a20715e44aceb875eff9.tar.gz embtoolkit-33e6854d9f942e374fb9a20715e44aceb875eff9.tar.bz2 embtoolkit-33e6854d9f942e374fb9a20715e44aceb875eff9.tar.xz | |
Build system: __embtk_pkg_statedir macro: also detect disabled packages
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk/macros.packages.mk')
| -rw-r--r-- | mk/macros.packages.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/mk/macros.packages.mk b/mk/macros.packages.mk index 165c7f9..df1846d 100644 --- a/mk/macros.packages.mk +++ b/mk/macros.packages.mk @@ -157,10 +157,13 @@ __embtk_pkg_srcdir = $(or $(__embtk_pkg_localgit),$(__embtk_pkg_localsvn),$(pat __embtk_pkg_builddir = $(patsubst %/,%,$(strip $($(PKGV)_BUILD_DIR))) __embtk_pkg_nowipeworkspace = $(strip $($(PKGV)_KEEP_SRC_DIR)) # State dir: where build system stores package states: installed, patched, etc. -__embtk_pkg_xstatedir = $(if $(__embtk_pkg_builddir),$(dir $(__embtk_pkg_builddir))) -__embtk_pkg_hoststatedir = $(if $(CONFIG_EMBTK_HOST_HAVE_$(PKGV)),$(embtk_toolsb)) -__embtk_pkg_targetstatedir = $(if $(CONFIG_EMBTK_HAVE_$(PKGV)),$(embtk_pkgb)) -___embtk_pkg_statedir = $(or $(__embtk_pkg_xstatedir),$(__embtk_pkg_hoststatedir),$(__embtk_pkg_targetstatedir)) +__embtk_pkg_x0statedir = $(if $(__embtk_pkg_builddir),$(dir $(__embtk_pkg_builddir))) +#__embtk_pkg_hoststatedir = $(if $(strip $(wildcard $(embtk_toolsb)/.embtk-$(__embtk_pkg_name)-$(pkgv))),$(embtk_toolsb)) +__embtk_pkg_targetstatedir = $(if $(strip $(wildcard $(embtk_pkgb)/.embtk-$(__embtk_pkg_name)-$(pkgv))),$(embtk_pkgb)) +__embtk_pkg_gitstatedir = $(dir $(wildcard $(EMBTK_ROOT)/src/*/$(__embtk_pkg_name).git)) +__embtk_pkg_svnstatedir = $(dir $(wildcard $(EMBTK_ROOT)/src/*/$(__embtk_pkg_name)*.svn)) +__embtk_pkg_gitsvnstatedir = $(or $(__embtk_pkg_gitstatedir),$(__embtk_pkg_svnstatedir)) +___embtk_pkg_statedir = $(or $(__embtk_pkg_x0statedir),$(__embtk_pkg_targetstatedir),$(__embtk_pkg_hoststatedir),$(__embtk_pkg_gitsvnstatedir)) __embtk_pkg_statedir = $(if $(___embtk_pkg_statedir),$(___embtk_pkg_statedir)/.embtk-$(__embtk_pkg_name)-$(pkgv)) __embtk_pkg_etc = $(strip $($(PKGV)_ETC)) |