aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2021-06-15 09:54:45 +0200
committerJo-Philipp Wich <jo@mein.io>2021-07-11 16:09:30 +0200
commitd3278c4343856bb2ebd1badca93234fb815d6a8c (patch)
tree894d3ae8d7cc374f4ffeb8394a9c3a554e7547de
parent47f617ef8d44e4d7428ff3e0b42acb4a75f5cd37 (diff)
downloadupstream-d3278c4343856bb2ebd1badca93234fb815d6a8c.tar.gz
upstream-d3278c4343856bb2ebd1badca93234fb815d6a8c.tar.bz2
upstream-d3278c4343856bb2ebd1badca93234fb815d6a8c.zip
build: ensure that dash isn't prepended twice to abi version suffix
The ABIV_$(pkgname) variable already is formatted so return it as-is from the GetABISuffix macro and only filter through FormatABISuffix if we read the raw ABI version value from a version stamp file. This ensures that binary intra-package dependencies on ABI versioned libraries are properly formatted. Ref: https://github.com/openwrt/packages/issues/15871 Fixes: f6a03bff5b ("build: prepend ABI suffixes with a dash if package name ends with digit") Signed-off-by: Jo-Philipp Wich <jo@mein.io> (cherry picked from commit fbb9b1f8ed0d8a76dd989cc6c16a4e0fda2b6e74)
-rw-r--r--include/feeds.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/feeds.mk b/include/feeds.mk
index e499ac2684..632fecb4a3 100644
--- a/include/feeds.mk
+++ b/include/feeds.mk
@@ -43,7 +43,7 @@ endef
# 1: package name
define GetABISuffix
-$(call FormatABISuffix,$(1),$(if $(ABIV_$(1)),$(ABIV_$(1)),$(foreach v,$(wildcard $(STAGING_DIR)/pkginfo/$(1).version),$(shell cat $(v)))))
+$(if $(ABIV_$(1)),$(ABIV_$(1)),$(call FormatABISuffix,$(1),$(foreach v,$(wildcard $(STAGING_DIR)/pkginfo/$(1).version),$(shell cat $(v)))))
endef
# 1: package name