Skip to contentSkip to conversation

Fix <PKG_NAME>_VERSION variable setup

PATCH New llandwerlin at gmail.com 2 participants 2 messages Sep 18, 2010 – Sep 20, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix <PKG_NAME>_VERSION variable setup

From: Lionel Landwerlin <[email protected]>

Commit 993e51bc22f508fbaf39c5c49fd0595fc5c56013 introduced a problem to compute <PKG_NAME>_VERSION variable when PKG_NAME start with 'HOST_'.

---
 package/Makefile.package.in |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
package/Makefile.package.in +8 -8
index 58a9a51..377df65 100644
@@ -337,22 +337,22 @@ define GENTARGETS_INNER
 $(2)_TYPE                       =  $(5)
 $(2)_NAME			=  $(1)
 
+# Keep the package version that may contain forward slashes in the _DL_VERSION
+# variable, then replace all forward slashes ('/') by underscores ('_') to
+# sanitize the package version that is used in paths, directory and file names.
+# Forward slashes may appear in the package's version when pointing to a
+# version control system branch or tag, for example remotes/origin/1_10_stable.
+$(2)_DL_VERSION	= $($(2)_VERSION)
 ifndef $(2)_VERSION
  ifdef $(3)_VERSION
   $(2)_VERSION = $($(3)_VERSION)
  else
   $(2)_VERSION = undefined
  endif
+else
+ $(2)_VERSION = $(subst /,_,$($(2)_VERSION))
 endif
 
-# Keep the package version that may contain forward slashes in the _DL_VERSION
-# variable, then replace all forward slashes ('/') by underscores ('_') to
-# sanitize the package version that is used in paths, directory and file names.
-# Forward slashes may appear in the package's version when pointing to a
-# version control system branch or tag, for example remotes/origin/1_10_stable.
-$(2)_DL_VERSION	= $($(2)_VERSION)
-$(2)_VERSION = $(subst /,_,$($(2)_VERSION))
-
 $(2)_BASE_NAME	=  $(1)-$$($(2)_VERSION)
 $(2)_DL_DIR	=  $$(DL_DIR)/$$($(2)_BASE_NAME)
 $(2)_DIR	=  $$(BUILD_DIR)/$$($(2)_BASE_NAME)
Signature · 1 line
1.7.1
#1 lore raw

PATCH 1/1 Fix <PKG_NAME>_VERSION variable setup

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"llandwerlin" == llandwerlin <[email protected]> writes:

llandwerlin> From: Lionel Landwerlin <[email protected]> llandwerlin> Commit 993e51bc22f508fbaf39c5c49fd0595fc5c56013 introduced a problem llandwerlin> to compute <PKG_NAME>_VERSION variable when PKG_NAME start with llandwerlin> 'HOST_'.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard