[openwrt/openwrt] build: fix ABI version for PROVIDES symbols

[LEDE Commits]

nbd pushed a commit to openwrt/openwrt.git, branch openwrt-21.02:
https://git.openwrt.org/cbe4beb442e10f9ad8fc71202e87c15a0859c44c

commit cbe4beb442e10f9ad8fc71202e87c15a0859c44c
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Thu Feb 18 19:51:05 2021 +0100

    build: fix ABI version for PROVIDES symbols
    
    GetABISuffix does not work for intra-package ABI version of provided symbols,
    since ABIV_$(provided) is not set.
    Fix ABI version by using $(ABIV_$(1)) directly
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
    (cherry-picked from commit 0db9d118657d)
---
 include/package-ipkg.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index a8210f8e31..5e51b301e1 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -175,7 +175,7 @@ Package: $(1)$$(ABIV_$(1))
 Version: $(VERSION)
 $$(call addfield,Depends,$$(Package/$(1)/DEPENDS)
 )$$(call addfield,Conflicts,$$(call mergelist,$(CONFLICTS))
-)$$(call addfield,Provides,$$(call mergelist,$$(filter-out $(1)$$(ABIV_$(1)),$(PROVIDES)$$(if $$(ABIV_$(1)), $(1) $(foreach provide,$(PROVIDES),$(provide)$$(call GetABISuffix,$(provide))))))
+)$$(call addfield,Provides,$$(call mergelist,$$(filter-out $(1)$$(ABIV_$(1)),$(PROVIDES)$$(if $$(ABIV_$(1)), $(1) $(foreach provide,$(PROVIDES),$(provide)$$(ABIV_$(1))))))
 )$$(call addfield,Alternatives,$$(call mergelist,$(ALTERNATIVES))
 )$$(call addfield,Source,$(SOURCE)
 )$$(call addfield,SourceName,$(1)