aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2021-02-18 19:51:05 +0100
committerFelix Fietkau <nbd@nbd.name>2021-02-18 19:57:57 +0100
commit0db9d118657dd93509abec817eb22ce13d0ec1b6 (patch)
treec71aefcade35db2f9b196253b09ad3246d72084a
parentd2d32dcd5f4bb2d028452419fb2e014b7b31a37a (diff)
downloadupstream-0db9d118657dd93509abec817eb22ce13d0ec1b6.tar.gz
upstream-0db9d118657dd93509abec817eb22ce13d0ec1b6.tar.bz2
upstream-0db9d118657dd93509abec817eb22ce13d0ec1b6.zip
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>
-rw-r--r--include/package-ipkg.mk2
1 files changed, 1 insertions, 1 deletions
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)