From: Felix Fietkau <nbd@nbd.name>
Date: Thu, 18 Feb 2021 18:51:05 +0000 (+0100)
Subject: build: fix ABI version for PROVIDES symbols
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0db9d118657dd93509abec817eb22ce13d0ec1b6;p=openwrt%2Fstaging%2Fjow.git

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@nbd.name>
---

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)