diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-01-11 11:43:55 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-01-11 11:43:55 +0100 |
| commit | 011948bd4b09f416eee02f5773d57e371336af9d (patch) | |
| tree | 12a3eb3a1c2c94d7685d9c7b71439b03a91681f4 | |
| parent | 3b1b7257c849505a59767f3ce494ed94f2fa0e4f (diff) | |
| download | embtoolkit-011948bd4b09f416eee02f5773d57e371336af9d.tar.gz embtoolkit-011948bd4b09f416eee02f5773d57e371336af9d.tar.bz2 embtoolkit-011948bd4b09f416eee02f5773d57e371336af9d.tar.xz | |
Build system: internal macros: improve __embtk_pkg_statedir to use less variables from .mk file
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
| -rw-r--r-- | mk/macros.packages.mk | 10 | ||||
| -rw-r--r-- | mk/packages.mk | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/mk/macros.packages.mk b/mk/macros.packages.mk index 93cc4d0..165c7f9 100644 --- a/mk/macros.packages.mk +++ b/mk/macros.packages.mk @@ -157,9 +157,11 @@ __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_statedir = $(dir $(__embtk_pkg_builddir)) -___embtk_pkg_statedir = $(____embtk_pkg_statedir)/.embtk-$(__embtk_pkg_name)-$(pkgv) -__embtk_pkg_statedir = $(___embtk_pkg_statedir) +__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_statedir = $(if $(___embtk_pkg_statedir),$(___embtk_pkg_statedir)/.embtk-$(__embtk_pkg_name)-$(pkgv)) __embtk_pkg_etc = $(strip $($(PKGV)_ETC)) __embtk_pkg_bins = $(strip $($(PKGV)_BINS)) @@ -824,7 +826,7 @@ define __embtk_cleanup_pkg $(call __embtk_unsetconfigured_pkg,$(1)) $(call __embtk_unsetinstalled_pkg,$(1)), $(if $(__embtk_pkg_builddir),rm -rf $(__embtk_pkg_builddir)*)) - rm -rf $(__embtk_pkg_statedir) + $(if $(__embtk_pkg_statedir),rm -rf $(__embtk_pkg_statedir)) endef define embtk_cleanup_pkg diff --git a/mk/packages.mk b/mk/packages.mk index b0ee471..a59cb7d 100644 --- a/mk/packages.mk +++ b/mk/packages.mk @@ -108,7 +108,7 @@ host_packages_build: $(Q)$(__embtk_hostpkgs_build) # -# Generic implicite rules +# Generic implicit rules # # This install implicit rule is intended for autotool'ed packages, or packages |