From 4ccf8e45d286e7e7a33f5f1482563daf620cb6e8 Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Sun, 11 Mar 2012 16:57:13 +0100 Subject: Build system: generic macros: rework __embtk_pkg_version internal macro Rework __embtk_pkg_version and take into account packages defining a version even if they use a scm repository as source. Signed-off-by: Abdoulaye Walsimou Gaye --- mk/macros.packages.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/macros.packages.mk b/mk/macros.packages.mk index 8fd01d2..92931f1 100644 --- a/mk/macros.packages.mk +++ b/mk/macros.packages.mk @@ -133,7 +133,7 @@ __embtk_pkg_gitrev = $(or $(call __embtk_mk_unquotestr,$(CONFIG_EMBTK_$(PKGV)_G __embtk_pkg_localgit = $(strip $(if $(__embtk_pkg_usegit), \ $(EMBTK_ROOT)/src/$(__embtk_pkg_refspec)/$(__embtk_pkg_name).git)) -__embtk_pkg_version = $(or $(__embtk_pkg_usegit),$(__embtk_pkg_usesvn),$(strip $($(PKGV)_VERSION))) +__embtk_pkg_version = $(or $(strip $($(PKGV)_VERSION)),$(__embtk_pkg_usegit),$(__embtk_pkg_usesvn)) __embtk_pkg_package_f = $(strip $(DOWNLOAD_DIR))/$(__embtk_pkg_package) __embtk_pkg_srcdir = $(or $(__embtk_pkg_localgit),$(__embtk_pkg_localsvn),$(patsubst %/,%,$(strip $($(PKGV)_SRC_DIR)))) -- cgit v1.2.3