build: ensure that dash isn't prepended twice to abi version suffix
authorJo-Philipp Wich <jo@mein.io>
Tue, 15 Jun 2021 07:54:45 +0000 (09:54 +0200)
committerJo-Philipp Wich <jo@mein.io>
Sun, 11 Jul 2021 14:09:30 +0000 (16:09 +0200)
commitd3278c4343856bb2ebd1badca93234fb815d6a8c
tree894d3ae8d7cc374f4ffeb8394a9c3a554e7547de
parent47f617ef8d44e4d7428ff3e0b42acb4a75f5cd37
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)
include/feeds.mk